m68knommu: consistently define ColdFire Peripheral registers
cover m68knommu: consistently define ColdFire Peripheral registers
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). Currently the address definitions are inconsistentely defined, some include the peripheral region, some are just offsets, while some obviously need to be the fixed absolute address. This is leading to occasional bugs using the address definitions wrongly.
This patch series (and to some extent the next 2 after it as well) aims to clean this up and make the address definitions consistent. The nice side effect is that it makes the headers a lot more redable too.
Following on from the address definition changes I will be posting 2 more patch series that fix up some of the bugs I referred to above, and also clean out a lot of old unused junk lying around in the headers.
PATCH 1/9 m68knommu: make ColdFire IMR and IPR register definitions absolute addresses
From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Interrupt Mask and Pending 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.
--- arch/m68k/include/asm/m5206sim.h | 4 ++-- arch/m68k/include/asm/m5249sim.h | 6 +++--- arch/m68k/include/asm/m525xsim.h | 4 ++-- arch/m68k/include/asm/m5272sim.h | 8 ++++---- arch/m68k/include/asm/m5307sim.h | 6 +++--- arch/m68k/include/asm/m5407sim.h | 6 +++--- arch/m68k/platform/coldfire/intc.c | 28 ++++++++++++++-------------- 7 files changed, 31 insertions(+), 31 deletions(-)
arch/m68k/include/asm/m5206sim.h +2 -2
@@ -40,8 +40,8 @@#define MCFSIM_ICR15 0x22/* Intr Ctrl reg 15 (r/w) */ #endif -#define MCFSIM_IMR 0x36/* Interrupt Mask reg (r/w) */ -#define MCFSIM_IPR 0x3a/* Interrupt Pend reg (r/w) */ +#define MCFSIM_IMR (MCF_MBAR + 0x36)/* Interrupt Mask */ +#define MCFSIM_IPR (MCF_MBAR + 0x3a)/* Interrupt Pending */ #define MCFSIM_RSR 0x40/* Reset Status reg (r/w) */ #define MCFSIM_SYPCR 0x41/* System Protection reg (r/w)*/
arch/m68k/include/asm/m5249sim.h +3 -3
@@ -32,9 +32,9 @@#define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ #define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ -#define MCFSIM_IPR 0x40/* Interrupt Pend reg (r/w) */ -#define MCFSIM_IMR 0x44/* Interrupt Mask reg (r/w) */ -#define MCFSIM_AVR 0x4b/* Autovector Ctrl reg (r/w) */ +#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ +#define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ +#define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ #define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ #define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ #define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */
arch/m68k/include/asm/m525xsim.h +2 -2
@@ -31,8 +31,8 @@#define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ -#define MCFSIM_IPR 0x40/* Interrupt Pend reg (r/w) */ -#define MCFSIM_IMR 0x44/* Interrupt Mask reg (r/w) */ +#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ +#define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ #define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ #define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ #define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */
arch/m68k/include/asm/m5272sim.h +4 -4
@@ -32,10 +32,10 @@#define MCFSIM_ICR3 0x28/* Intr Ctrl reg 3 (r/w) */ #define MCFSIM_ICR4 0x2c/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ISR 0x30/* Interrupt Source reg (r/w) */ -#define MCFSIM_PITR 0x34/* Interrupt Transition (r/w) */ -#define MCFSIM_PIWR 0x38/* Interrupt Wakeup reg (r/w) */ -#define MCFSIM_PIVR 0x3f/* Interrupt Vector reg (r/w( */ +#define MCFSIM_ISR (MCF_MBAR + 0x30)/* Intr Source */ +#define MCFSIM_PITR (MCF_MBAR + 0x34)/* Intr Transition */ +#define MCFSIM_PIWR (MCF_MBAR + 0x38)/* Intr Wakeup */ +#define MCFSIM_PIVR (MCF_MBAR + 0x3f)/* Intr Vector */ #define MCFSIM_WRRR 0x280/* Watchdog reference (r/w) */ #define MCFSIM_WIRR 0x284/* Watchdog interrupt (r/w) */
arch/m68k/include/asm/m5307sim.h +3 -3
@@ -31,9 +31,9 @@#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_IPR 0x40/* Interrupt Pend reg (r/w) */ -#define MCFSIM_IMR 0x44/* Interrupt Mask reg (r/w) */ -#define MCFSIM_AVR 0x4b/* Autovector Ctrl reg (r/w) */ +#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pend */ +#define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ +#define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ #define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ #define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ #define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */
arch/m68k/include/asm/m5407sim.h +3 -3
@@ -31,9 +31,9 @@#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_IPR 0x40/* Interrupt Pend reg (r/w) */ -#define MCFSIM_IMR 0x44/* Interrupt Mask reg (r/w) */ -#define MCFSIM_AVR 0x4b/* Autovector Ctrl reg (r/w) */ +#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ +#define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ +#define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ #define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ #define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ #define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */
arch/m68k/platform/coldfire/intc.c +14 -14
@@ -45,23 +45,23 @@ unsigned char mcf_irq2imr[NR_IRQS];void mcf_setimr (int index) {u16 imr; - imr =__raw_readw (MCF_MBAR +MCFSIM_IMR ); -__raw_writew (imr | (0x1 << index),MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readw (MCFSIM_IMR ); +__raw_writew (imr | (0x1 << index),MCFSIM_IMR ); }void mcf_clrimr (int index) {u16 imr; - imr =__raw_readw (MCF_MBAR +MCFSIM_IMR ); -__raw_writew (imr & ~(0x1 << index),MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readw (MCFSIM_IMR ); +__raw_writew (imr & ~(0x1 << index),MCFSIM_IMR ); }void mcf_maskimr (unsigned int mask) {u16 imr; - imr =__raw_readw (MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readw (MCFSIM_IMR ); imr |= mask; -__raw_writew (imr,MCF_MBAR +MCFSIM_IMR ); +__raw_writew (imr,MCFSIM_IMR ); }#else
@@ -69,23 +69,23 @@ void mcf_maskimr(unsigned int mask)void mcf_setimr (int index) {u32 imr; - imr =__raw_readl (MCF_MBAR +MCFSIM_IMR ); -__raw_writel (imr | (0x1 << index),MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readl (MCFSIM_IMR ); +__raw_writel (imr | (0x1 << index),MCFSIM_IMR ); }void mcf_clrimr (int index) {u32 imr; - imr =__raw_readl (MCF_MBAR +MCFSIM_IMR ); -__raw_writel (imr & ~(0x1 << index),MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readl (MCFSIM_IMR ); +__raw_writel (imr & ~(0x1 << index),MCFSIM_IMR ); }void mcf_maskimr (unsigned int mask) {u32 imr; - imr =__raw_readl (MCF_MBAR +MCFSIM_IMR ); + imr =__raw_readl (MCFSIM_IMR ); imr |= mask; -__raw_writel (imr,MCF_MBAR +MCFSIM_IMR ); +__raw_writel (imr,MCFSIM_IMR ); }#endif
@@ -104,9 +104,9 @@ void mcf_autovector(int irq)#ifdef MCFSIM_AVR if ((irq >=EIRQ1 ) && (irq <=EIRQ7 )) {u8 avec; - avec =__raw_readb (MCF_MBAR +MCFSIM_AVR ); + avec =__raw_readb (MCFSIM_AVR ); avec |= (0x1 << (irq -EIRQ1 +1 )); -__raw_writeb (avec,MCF_MBAR +MCFSIM_AVR ); +__raw_writeb (avec,MCFSIM_AVR ); }#endif }
Signature · 1 line
1.7.0.4
PATCH 2/9 m68knommu: make ColdFire SYPCR and RSR register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Reset and System 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 abolsute 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.
--- arch/m68k/include/asm/m5206sim.h | 4 ++-- arch/m68k/include/asm/m5249sim.h | 4 ++-- arch/m68k/include/asm/m525xsim.h | 4 ++-- arch/m68k/include/asm/m5307sim.h | 4 ++-- arch/m68k/include/asm/m5407sim.h | 4 ++-- arch/m68k/platform/coldfire/reset.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
arch/m68k/include/asm/m5206sim.h +2 -2
@@ -43,8 +43,8 @@#define MCFSIM_IMR (MCF_MBAR + 0x36)/* Interrupt Mask */ #define MCFSIM_IPR (MCF_MBAR + 0x3a)/* Interrupt Pending */ -#define MCFSIM_RSR 0x40/* Reset Status reg (r/w) */ -#define MCFSIM_SYPCR 0x41/* System Protection reg (r/w)*/ +#define MCFSIM_RSR (MCF_MBAR + 0x40)/* Reset Status */ +#define MCFSIM_SYPCR (MCF_MBAR + 0x41)/* System Protection */ #define MCFSIM_SWIVR 0x42/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x43/* SW Watchdog service (r/w) */
arch/m68k/include/asm/m5249sim.h +2 -2
@@ -25,8 +25,8 @@/* * Define the 5249 SIM register set addresses. */ -#define MCFSIM_RSR 0x00/* Reset Status reg (r/w) */ -#define MCFSIM_SYPCR 0x01/* System Protection reg (r/w)*/ +#define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ +#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */
arch/m68k/include/asm/m525xsim.h +2 -2
@@ -26,8 +26,8 @@/* * Define the 525x SIM register set addresses. */ -#define MCFSIM_RSR 0x00/* Reset Status reg (r/w) */ -#define MCFSIM_SYPCR 0x01/* System Protection reg (r/w)*/ +#define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ +#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/
arch/m68k/include/asm/m5307sim.h +2 -2
@@ -23,8 +23,8 @@/* * Define the 5307 SIM register set addresses. */ -#define MCFSIM_RSR 0x00/* Reset Status reg (r/w) */ -#define MCFSIM_SYPCR 0x01/* System Protection reg (r/w)*/ +#define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status reg */ +#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */
arch/m68k/include/asm/m5407sim.h +2 -2
@@ -23,8 +23,8 @@/* * Define the 5407 SIM register set addresses. */ -#define MCFSIM_RSR 0x00/* Reset Status reg (r/w) */ -#define MCFSIM_SYPCR 0x01/* System Protection reg (r/w)*/ +#define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ +#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ #define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */
arch/m68k/platform/coldfire/reset.c +1 -1
@@ -27,7 +27,7 @@ static void mcf_cpu_reset(void) {local_irq_disable ();/* Set watchdog to soft reset, and enabled */ -__raw_writeb (0xc0 ,MCF_MBAR +MCFSIM_SYPCR ); +__raw_writeb (0xc0 ,MCFSIM_SYPCR );for (;;)/* wait for watchdog to timeout */ ; }
Signature · 1 line
1.7.0.4
PATCH 3/9 m68knommu: make ColdFire watchdog register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Software watchdog 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.
--- arch/m68k/include/asm/m5206sim.h | 4 ++-- arch/m68k/include/asm/m5249sim.h | 4 ++-- arch/m68k/include/asm/m525xsim.h | 4 ++-- arch/m68k/include/asm/m5272sim.h | 8 ++++---- arch/m68k/include/asm/m5307sim.h | 4 ++-- arch/m68k/include/asm/m5407sim.h | 4 ++-- arch/m68k/platform/coldfire/m5272.c | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-)
arch/m68k/include/asm/m5206sim.h +2 -2
@@ -46,8 +46,8 @@#define MCFSIM_RSR (MCF_MBAR + 0x40)/* Reset Status */ #define MCFSIM_SYPCR (MCF_MBAR + 0x41)/* System Protection */ -#define MCFSIM_SWIVR 0x42/* SW Watchdog intr reg (r/w) */ -#define MCFSIM_SWSR 0x43/* SW Watchdog service (r/w) */ +#define MCFSIM_SWIVR (MCF_MBAR + 0x42)/* SW Watchdog intr */ +#define MCFSIM_SWSR (MCF_MBAR + 0x43)/* SW Watchdog srv */ #define MCFSIM_DCRR (MCF_MBAR + 0x46)/* DRAM Refresh reg (r/w) */ #define MCFSIM_DCTR (MCF_MBAR + 0x4a)/* DRAM Timing reg (r/w) */
arch/m68k/include/asm/m5249sim.h +2 -2
@@ -27,8 +27,8 @@*/ #define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ #define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ -#define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ -#define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ +#define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ +#define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog srv */ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ #define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/
arch/m68k/include/asm/m525xsim.h +2 -2
@@ -28,8 +28,8 @@*/ #define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ #define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ -#define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ -#define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ +#define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ +#define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog srv */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ #define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */
arch/m68k/include/asm/m5272sim.h +4 -4
@@ -37,10 +37,10 @@#define MCFSIM_PIWR (MCF_MBAR + 0x38)/* Intr Wakeup */ #define MCFSIM_PIVR (MCF_MBAR + 0x3f)/* Intr Vector */ -#define MCFSIM_WRRR 0x280/* Watchdog reference (r/w) */ -#define MCFSIM_WIRR 0x284/* Watchdog interrupt (r/w) */ -#define MCFSIM_WCR 0x288/* Watchdog counter (r/w) */ -#define MCFSIM_WER 0x28c/* Watchdog event (r/w) */ +#define MCFSIM_WRRR (MCF_MBAR + 0x280)/* Watchdog reference */ +#define MCFSIM_WIRR (MCF_MBAR + 0x284)/* Watchdog interrupt */ +#define MCFSIM_WCR (MCF_MBAR + 0x288)/* Watchdog counter */ +#define MCFSIM_WER (MCF_MBAR + 0x28c)/* Watchdog event */ #define MCFSIM_CSBR0 0x40/* CS0 Base Address (r/w) */ #define MCFSIM_CSOR0 0x44/* CS0 Option (r/w) */
arch/m68k/include/asm/m5307sim.h +2 -2
@@ -25,8 +25,8 @@*/ #define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status reg */ #define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ -#define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ -#define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ +#define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ +#define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog service*/ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ #define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ #define MCFSIM_PLLCR 0x08/* PLL Control Reg*/
arch/m68k/include/asm/m5407sim.h +2 -2
@@ -25,8 +25,8 @@*/ #define MCFSIM_RSR (MCF_MBAR + 0x00)/* Reset Status */ #define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ -#define MCFSIM_SWIVR 0x02/* SW Watchdog intr reg (r/w) */ -#define MCFSIM_SWSR 0x03/* SW Watchdog service (r/w) */ +#define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ +#define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog service*/ #define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ #define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ #define MCFSIM_PLLCR 0x08/* PLL Control Reg*/
arch/m68k/platform/coldfire/m5272.c +3 -3
@@ -50,9 +50,9 @@ static void m5272_cpu_reset(void) {local_irq_disable ();/* Set watchdog to reset, and enabled */ -__raw_writew (0 ,MCF_MBAR +MCFSIM_WIRR ); -__raw_writew (1 ,MCF_MBAR +MCFSIM_WRRR ); -__raw_writew (0 ,MCF_MBAR +MCFSIM_WCR ); +__raw_writew (0 ,MCFSIM_WIRR ); +__raw_writew (1 ,MCFSIM_WRRR ); +__raw_writew (0 ,MCFSIM_WCR );for (;;)/* wait for watchdog to timeout */ ; }
Signature · 1 line
1.7.0.4
PATCH 4/9 m68knommu: make ColdFire Pin Assignment register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Pin 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.
--- arch/m68k/include/asm/m5206sim.h | 4 ++-- arch/m68k/include/asm/m5249sim.h | 2 +- arch/m68k/include/asm/m5307sim.h | 2 +- arch/m68k/include/asm/m5407sim.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/m68k/include/asm/m5206sim.h +2 -2
@@ -85,9 +85,9 @@#define MCFSIM_DMCR 0xc6/* Default control */ #ifdef CONFIG_M5206e -#define MCFSIM_PAR 0xca/* Pin Assignment reg (r/w) */ +#define MCFSIM_PAR (MCF_MBAR + 0xca)/* Pin Assignment */ #else -#define MCFSIM_PAR 0xcb/* Pin Assignment reg (r/w) */ +#define MCFSIM_PAR (MCF_MBAR + 0xcb)/* Pin Assignment */ #endif #define MCFTIMER_BASE1 (MCF_MBAR + 0x100)/* Base of TIMER1 */
arch/m68k/include/asm/m5249sim.h +1 -1
@@ -29,7 +29,7 @@#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ #define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog srv */ -#define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ +#define MCFSIM_PAR (MCF_MBAR + 0x04)/* Pin Assignment */ #define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ #define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ #define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */
arch/m68k/include/asm/m5307sim.h +1 -1
@@ -27,7 +27,7 @@#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ #define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog service*/ -#define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ +#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*/
arch/m68k/include/asm/m5407sim.h +1 -1
@@ -27,7 +27,7 @@#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ #define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog service*/ -#define MCFSIM_PAR 0x04/* Pin Assignment reg (r/w) */ +#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*/
Signature · 1 line
1.7.0.4
PATCH 5/9 m68knommu: make ColdFire Interrupt Source register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Interrupt Source 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.
--- arch/m68k/include/asm/m5206sim.h | 32 +++++++++++++++--------------- arch/m68k/include/asm/m5249sim.h | 24 +++++++++++----------- arch/m68k/include/asm/m525xsim.h | 24 +++++++++++----------- arch/m68k/include/asm/m5272sim.h | 8 +++--- arch/m68k/include/asm/m5307sim.h | 24 +++++++++++----------- arch/m68k/include/asm/m5407sim.h | 24 +++++++++++----------- arch/m68k/platform/coldfire/device.c | 4 +- arch/m68k/platform/coldfire/intc-5272.c | 20 +++++++++--------- arch/m68k/platform/coldfire/m5249.c | 2 +- arch/m68k/platform/coldfire/m525x.c | 4 +- arch/m68k/platform/coldfire/timers.c | 4 +- 11 files changed, 85 insertions(+), 85 deletions(-)
arch/m68k/include/asm/m5206sim.h +16 -16
@@ -21,23 +21,23 @@/* * Define the 5206 SIM register set addresses. */ -#define MCFSIM_SIMR 0x03/* SIM Config reg (r/w) */ -#define MCFSIM_ICR1 0x14/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x15/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x16/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x17/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ICR5 0x18/* Intr Ctrl reg 5 (r/w) */ -#define MCFSIM_ICR6 0x19/* Intr Ctrl reg 6 (r/w) */ -#define MCFSIM_ICR7 0x1a/* Intr Ctrl reg 7 (r/w) */ -#define MCFSIM_ICR8 0x1b/* Intr Ctrl reg 8 (r/w) */ -#define MCFSIM_ICR9 0x1c/* Intr Ctrl reg 9 (r/w) */ -#define MCFSIM_ICR10 0x1d/* Intr Ctrl reg 10 (r/w) */ -#define MCFSIM_ICR11 0x1e/* Intr Ctrl reg 11 (r/w) */ -#define MCFSIM_ICR12 0x1f/* Intr Ctrl reg 12 (r/w) */ -#define MCFSIM_ICR13 0x20/* Intr Ctrl reg 13 (r/w) */ +#define MCFSIM_SIMR (MCF_MBAR + 0x03)/* SIM Config reg */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x14)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x15)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x16)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x17)/* Intr Ctrl reg 4 */ +#define MCFSIM_ICR5 (MCF_MBAR + 0x18)/* Intr Ctrl reg 5 */ +#define MCFSIM_ICR6 (MCF_MBAR + 0x19)/* Intr Ctrl reg 6 */ +#define MCFSIM_ICR7 (MCF_MBAR + 0x1a)/* Intr Ctrl reg 7 */ +#define MCFSIM_ICR8 (MCF_MBAR + 0x1b)/* Intr Ctrl reg 8 */ +#define MCFSIM_ICR9 (MCF_MBAR + 0x1c)/* Intr Ctrl reg 9 */ +#define MCFSIM_ICR10 (MCF_MBAR + 0x1d)/* Intr Ctrl reg 10 */ +#define MCFSIM_ICR11 (MCF_MBAR + 0x1e)/* Intr Ctrl reg 11 */ +#define MCFSIM_ICR12 (MCF_MBAR + 0x1f)/* Intr Ctrl reg 12 */ +#define MCFSIM_ICR13 (MCF_MBAR + 0x20)/* Intr Ctrl reg 13 */ #ifdef CONFIG_M5206e -#define MCFSIM_ICR14 0x21/* Intr Ctrl reg 14 (r/w) */ -#define MCFSIM_ICR15 0x22/* Intr Ctrl reg 15 (r/w) */ +#define MCFSIM_ICR14 (MCF_MBAR + 0x21)/* Intr Ctrl reg 14 */ +#define MCFSIM_ICR15 (MCF_MBAR + 0x22)/* Intr Ctrl reg 15 */ #endif #define MCFSIM_IMR (MCF_MBAR + 0x36)/* Interrupt Mask */
arch/m68k/include/asm/m5249sim.h +12 -12
@@ -35,18 +35,18 @@#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ #define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ -#define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ -#define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x4f/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x50/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ICR5 0x51/* Intr Ctrl reg 5 (r/w) */ -#define MCFSIM_ICR6 0x52/* Intr Ctrl reg 6 (r/w) */ -#define MCFSIM_ICR7 0x53/* Intr Ctrl reg 7 (r/w) */ -#define MCFSIM_ICR8 0x54/* Intr Ctrl reg 8 (r/w) */ -#define MCFSIM_ICR9 0x55/* Intr Ctrl reg 9 (r/w) */ -#define MCFSIM_ICR10 0x56/* Intr Ctrl reg 10 (r/w) */ -#define MCFSIM_ICR11 0x57/* Intr Ctrl reg 11 (r/w) */ +#define MCFSIM_ICR0 (MCF_MBAR + 0x4c)/* Intr Ctrl reg 0 */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x4d)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x4e)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x4f)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x50)/* Intr Ctrl reg 4 */ +#define MCFSIM_ICR5 (MCF_MBAR + 0x51)/* Intr Ctrl reg 5 */ +#define MCFSIM_ICR6 (MCF_MBAR + 0x52)/* Intr Ctrl reg 6 */ +#define MCFSIM_ICR7 (MCF_MBAR + 0x53)/* Intr Ctrl reg 7 */ +#define MCFSIM_ICR8 (MCF_MBAR + 0x54)/* Intr Ctrl reg 8 */ +#define MCFSIM_ICR9 (MCF_MBAR + 0x55)/* Intr Ctrl reg 9 */ +#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ +#define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ #define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ #define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */
arch/m68k/include/asm/m525xsim.h +12 -12
@@ -33,18 +33,18 @@#define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ #define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ -#define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ -#define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x4f/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x50/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ICR5 0x51/* Intr Ctrl reg 5 (r/w) */ -#define MCFSIM_ICR6 0x52/* Intr Ctrl reg 6 (r/w) */ -#define MCFSIM_ICR7 0x53/* Intr Ctrl reg 7 (r/w) */ -#define MCFSIM_ICR8 0x54/* Intr Ctrl reg 8 (r/w) */ -#define MCFSIM_ICR9 0x55/* Intr Ctrl reg 9 (r/w) */ -#define MCFSIM_ICR10 0x56/* Intr Ctrl reg 10 (r/w) */ -#define MCFSIM_ICR11 0x57/* Intr Ctrl reg 11 (r/w) */ +#define MCFSIM_ICR0 (MCF_MBAR + 0x4c)/* Intr Ctrl reg 0 */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x4d)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x4e)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x4f)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x50)/* Intr Ctrl reg 4 */ +#define MCFSIM_ICR5 (MCF_MBAR + 0x51)/* Intr Ctrl reg 5 */ +#define MCFSIM_ICR6 (MCF_MBAR + 0x52)/* Intr Ctrl reg 6 */ +#define MCFSIM_ICR7 (MCF_MBAR + 0x53)/* Intr Ctrl reg 7 */ +#define MCFSIM_ICR8 (MCF_MBAR + 0x54)/* Intr Ctrl reg 8 */ +#define MCFSIM_ICR9 (MCF_MBAR + 0x55)/* Intr Ctrl reg 9 */ +#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ +#define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ #define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ #define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */
arch/m68k/include/asm/m5272sim.h +4 -4
@@ -27,10 +27,10 @@#define MCFSIM_APMR 0x0e/* Active Low Power reg (r/w) */ #define MCFSIM_DIR 0x10/* Device Identity reg (r/w) */ -#define MCFSIM_ICR1 0x20/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x24/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x28/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x2c/* Intr Ctrl reg 4 (r/w) */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x20)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x24)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x28)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x2c)/* Intr Ctrl reg 4 */ #define MCFSIM_ISR (MCF_MBAR + 0x30)/* Intr Source */ #define MCFSIM_PITR (MCF_MBAR + 0x34)/* Intr Transition */
arch/m68k/include/asm/m5307sim.h +12 -12
@@ -34,18 +34,18 @@#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pend */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ #define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ -#define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ -#define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x4f/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x50/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ICR5 0x51/* Intr Ctrl reg 5 (r/w) */ -#define MCFSIM_ICR6 0x52/* Intr Ctrl reg 6 (r/w) */ -#define MCFSIM_ICR7 0x53/* Intr Ctrl reg 7 (r/w) */ -#define MCFSIM_ICR8 0x54/* Intr Ctrl reg 8 (r/w) */ -#define MCFSIM_ICR9 0x55/* Intr Ctrl reg 9 (r/w) */ -#define MCFSIM_ICR10 0x56/* Intr Ctrl reg 10 (r/w) */ -#define MCFSIM_ICR11 0x57/* Intr Ctrl reg 11 (r/w) */ +#define MCFSIM_ICR0 (MCF_MBAR + 0x4c)/* Intr Ctrl reg 0 */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x4d)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x4e)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x4f)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x50)/* Intr Ctrl reg 4 */ +#define MCFSIM_ICR5 (MCF_MBAR + 0x51)/* Intr Ctrl reg 5 */ +#define MCFSIM_ICR6 (MCF_MBAR + 0x52)/* Intr Ctrl reg 6 */ +#define MCFSIM_ICR7 (MCF_MBAR + 0x53)/* Intr Ctrl reg 7 */ +#define MCFSIM_ICR8 (MCF_MBAR + 0x54)/* Intr Ctrl reg 8 */ +#define MCFSIM_ICR9 (MCF_MBAR + 0x55)/* Intr Ctrl reg 9 */ +#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ +#define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ #define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ #define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */
arch/m68k/include/asm/m5407sim.h +12 -12
@@ -34,18 +34,18 @@#define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pending */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ #define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */ -#define MCFSIM_ICR0 0x4c/* Intr Ctrl reg 0 (r/w) */ -#define MCFSIM_ICR1 0x4d/* Intr Ctrl reg 1 (r/w) */ -#define MCFSIM_ICR2 0x4e/* Intr Ctrl reg 2 (r/w) */ -#define MCFSIM_ICR3 0x4f/* Intr Ctrl reg 3 (r/w) */ -#define MCFSIM_ICR4 0x50/* Intr Ctrl reg 4 (r/w) */ -#define MCFSIM_ICR5 0x51/* Intr Ctrl reg 5 (r/w) */ -#define MCFSIM_ICR6 0x52/* Intr Ctrl reg 6 (r/w) */ -#define MCFSIM_ICR7 0x53/* Intr Ctrl reg 7 (r/w) */ -#define MCFSIM_ICR8 0x54/* Intr Ctrl reg 8 (r/w) */ -#define MCFSIM_ICR9 0x55/* Intr Ctrl reg 9 (r/w) */ -#define MCFSIM_ICR10 0x56/* Intr Ctrl reg 10 (r/w) */ -#define MCFSIM_ICR11 0x57/* Intr Ctrl reg 11 (r/w) */ +#define MCFSIM_ICR0 (MCF_MBAR + 0x4c)/* Intr Ctrl reg 0 */ +#define MCFSIM_ICR1 (MCF_MBAR + 0x4d)/* Intr Ctrl reg 1 */ +#define MCFSIM_ICR2 (MCF_MBAR + 0x4e)/* Intr Ctrl reg 2 */ +#define MCFSIM_ICR3 (MCF_MBAR + 0x4f)/* Intr Ctrl reg 3 */ +#define MCFSIM_ICR4 (MCF_MBAR + 0x50)/* Intr Ctrl reg 4 */ +#define MCFSIM_ICR5 (MCF_MBAR + 0x51)/* Intr Ctrl reg 5 */ +#define MCFSIM_ICR6 (MCF_MBAR + 0x52)/* Intr Ctrl reg 6 */ +#define MCFSIM_ICR7 (MCF_MBAR + 0x53)/* Intr Ctrl reg 7 */ +#define MCFSIM_ICR8 (MCF_MBAR + 0x54)/* Intr Ctrl reg 8 */ +#define MCFSIM_ICR9 (MCF_MBAR + 0x55)/* Intr Ctrl reg 9 */ +#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ +#define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ #define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ #define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */
arch/m68k/platform/coldfire/device.c +2 -2
@@ -347,12 +347,12 @@ static void __init mcf_uart_set_irq(void) {#ifdef MCFUART_UIVR /* UART0 interrupt setup */ -writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI1 ,MCF_MBAR +MCFSIM_UART1ICR ); +writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI1 ,MCFSIM_UART1ICR );writeb (MCF_IRQ_UART0 ,MCFUART_BASE0 +MCFUART_UIVR );mcf_mapirq2imr (MCF_IRQ_UART0 ,MCFINTC_UART0 );/* UART1 interrupt setup */ -writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI2 ,MCF_MBAR +MCFSIM_UART2ICR ); +writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI2 ,MCFSIM_UART2ICR );writeb (MCF_IRQ_UART1 ,MCFUART_BASE1 +MCFUART_UIVR );mcf_mapirq2imr (MCF_IRQ_UART1 ,MCFINTC_UART1 );#endif
arch/m68k/platform/coldfire/intc-5272.c +10 -10
@@ -86,7 +86,7 @@ static void intc_irq_mask(struct irq_data *d)u32 v; irq -=MCFINT_VECBASE ; v =0x8 << intc_irqmap[irq].index; -writel (v,MCF_MBAR + intc_irqmap[irq].icr); +writel (v, intc_irqmap[irq].icr); } }
@@ -98,7 +98,7 @@ static void intc_irq_unmask(struct irq_data *d)u32 v; irq -=MCFINT_VECBASE ; v =0xd << intc_irqmap[irq].index; -writel (v,MCF_MBAR + intc_irqmap[irq].icr); +writel (v, intc_irqmap[irq].icr); } }
@@ -111,10 +111,10 @@ static void intc_irq_ack(struct irq_data *d) irq -=MCFINT_VECBASE ;if (intc_irqmap[irq].ack) {u32 v; - v =readl (MCF_MBAR + intc_irqmap[irq].icr); + v =readl (intc_irqmap[irq].icr); v &= (0x7 << intc_irqmap[irq].index); v |= (0x8 << intc_irqmap[irq].index); -writel (v,MCF_MBAR + intc_irqmap[irq].icr); +writel (v, intc_irqmap[irq].icr); } } }
@@ -127,12 +127,12 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type) irq -=MCFINT_VECBASE ;if (intc_irqmap[irq].ack) {u32 v; - v =readl (MCF_MBAR +MCFSIM_PITR ); + v =readl (MCFSIM_PITR );if (type ==IRQ_TYPE_EDGE_FALLING ) v &= ~(0x1 << (32 - irq));else v |= (0x1 << (32 - irq)); -writel (v,MCF_MBAR +MCFSIM_PITR ); +writel (v,MCFSIM_PITR ); } }return 0 ;
@@ -163,10 +163,10 @@ void __init init_IRQ(void)int irq, edge;/* Mask all interrupt sources */ -writel (0x88888888 ,MCF_MBAR +MCFSIM_ICR1 ); -writel (0x88888888 ,MCF_MBAR +MCFSIM_ICR2 ); -writel (0x88888888 ,MCF_MBAR +MCFSIM_ICR3 ); -writel (0x88888888 ,MCF_MBAR +MCFSIM_ICR4 ); +writel (0x88888888 ,MCFSIM_ICR1 ); +writel (0x88888888 ,MCFSIM_ICR2 ); +writel (0x88888888 ,MCFSIM_ICR3 ); +writel (0x88888888 ,MCFSIM_ICR4 );for (irq =0 ; (irq <NR_IRQS ); irq++) {irq_set_chip (irq, &intc_irq_chip);
arch/m68k/platform/coldfire/m5249.c +1 -1
@@ -57,7 +57,7 @@ static void __init m5249_qspi_init(void) {/* QSPI irq setup */ writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 , -MCF_MBAR +MCFSIM_QSPIICR ); +MCFSIM_QSPIICR );mcf_mapirq2imr (MCF_IRQ_QSPI ,MCFINTC_QSPI ); }
arch/m68k/platform/coldfire/m525x.c +2 -2
@@ -30,7 +30,7 @@ static void __init m525x_qspi_init(void)/* QSPI irq setup */ writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 , -MCF_MBAR +MCFSIM_QSPIICR ); +MCFSIM_QSPIICR );mcf_mapirq2imr (MCF_IRQ_QSPI ,MCFINTC_QSPI );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ }
@@ -42,7 +42,7 @@ static void __init m525x_i2c_init(void)/* first I2C controller uses regular irq setup */ writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , -MCF_MBAR +MCFSIM_I2CICR ); +MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );/* second I2C controller is completely different */
arch/m68k/platform/coldfire/timers.c +2 -2
@@ -56,13 +56,13 @@ static void init_timer_irq(void)#ifdef MCFSIM_ICR_AUTOVEC /* Timer1 is always used as system timer */ writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI3 , -MCF_MBAR +MCFSIM_TIMER1ICR ); +MCFSIM_TIMER1ICR );mcf_mapirq2imr (MCF_IRQ_TIMER ,MCFINTC_TIMER1 );#ifdef CONFIG_HIGHPROFILE /* Timer2 is to be used as a high speed profile timer */ writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL7 |MCFSIM_ICR_PRI3 , -MCF_MBAR +MCFSIM_TIMER2ICR ); +MCFSIM_TIMER2ICR );mcf_mapirq2imr (MCF_IRQ_PROFILER ,MCFINTC_TIMER2 );#endif #endif /* MCFSIM_ICR_AUTOVEC */
Signature · 1 line
1.7.0.4
PATCH 6/9 m68knommu: make ColdFire Chip Select register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make all definitions of the ColdFire Chip Select 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.
--- arch/m68k/include/asm/m5206sim.h | 50 +++++++++++----------- arch/m68k/include/asm/m5249sim.h | 24 +++++----- arch/m68k/include/asm/m525xsim.h | 30 +++++++------- arch/m68k/include/asm/m5272sim.h | 32 +++++++------- arch/m68k/include/asm/m5307sim.h | 76 +++++++++++++++++----------------- arch/m68k/include/asm/m5407sim.h | 48 +++++++++++----------- arch/m68k/platform/coldfire/head.S | 2 +- arch/m68k/platform/coldfire/nettel.c | 4 +- 8 files changed, 133 insertions(+), 133 deletions(-)
arch/m68k/include/asm/m5206sim.h +25 -25
@@ -58,31 +58,31 @@#define MCFSIM_DMR1 (MCF_MBAR + 0x5c)/* DRAM 1 Mask reg (r/w) */ #define MCFSIM_DCR1 (MCF_MBAR + 0x63)/* DRAM 1 Control reg (r/w) */ -#define MCFSIM_CSAR0 0x64/* CS 0 Address 0 reg (r/w) */ -#define MCFSIM_CSMR0 0x68/* CS 0 Mask 0 reg (r/w) */ -#define MCFSIM_CSCR0 0x6e/* CS 0 Control reg (r/w) */ -#define MCFSIM_CSAR1 0x70/* CS 1 Address reg (r/w) */ -#define MCFSIM_CSMR1 0x74/* CS 1 Mask reg (r/w) */ -#define MCFSIM_CSCR1 0x7a/* CS 1 Control reg (r/w) */ -#define MCFSIM_CSAR2 0x7c/* CS 2 Address reg (r/w) */ -#define MCFSIM_CSMR2 0x80/* CS 2 Mask reg (r/w) */ -#define MCFSIM_CSCR2 0x86/* CS 2 Control reg (r/w) */ -#define MCFSIM_CSAR3 0x88/* CS 3 Address reg (r/w) */ -#define MCFSIM_CSMR3 0x8c/* CS 3 Mask reg (r/w) */ -#define MCFSIM_CSCR3 0x92/* CS 3 Control reg (r/w) */ -#define MCFSIM_CSAR4 0x94/* CS 4 Address reg (r/w) */ -#define MCFSIM_CSMR4 0x98/* CS 4 Mask reg (r/w) */ -#define MCFSIM_CSCR4 0x9e/* CS 4 Control reg (r/w) */ -#define MCFSIM_CSAR5 0xa0/* CS 5 Address reg (r/w) */ -#define MCFSIM_CSMR5 0xa4/* CS 5 Mask reg (r/w) */ -#define MCFSIM_CSCR5 0xaa/* CS 5 Control reg (r/w) */ -#define MCFSIM_CSAR6 0xac/* CS 6 Address reg (r/w) */ -#define MCFSIM_CSMR6 0xb0/* CS 6 Mask reg (r/w) */ -#define MCFSIM_CSCR6 0xb6/* CS 6 Control reg (r/w) */ -#define MCFSIM_CSAR7 0xb8/* CS 7 Address reg (r/w) */ -#define MCFSIM_CSMR7 0xbc/* CS 7 Mask reg (r/w) */ -#define MCFSIM_CSCR7 0xc2/* CS 7 Control reg (r/w) */ -#define MCFSIM_DMCR 0xc6/* Default control */ +#define MCFSIM_CSAR0 (MCF_MBAR + 0x64)/* CS 0 Address reg */ +#define MCFSIM_CSMR0 (MCF_MBAR + 0x68)/* CS 0 Mask reg */ +#define MCFSIM_CSCR0 (MCF_MBAR + 0x6e)/* CS 0 Control reg */ +#define MCFSIM_CSAR1 (MCF_MBAR + 0x70)/* CS 1 Address reg */ +#define MCFSIM_CSMR1 (MCF_MBAR + 0x74)/* CS 1 Mask reg */ +#define MCFSIM_CSCR1 (MCF_MBAR + 0x7a)/* CS 1 Control reg */ +#define MCFSIM_CSAR2 (MCF_MBAR + 0x7c)/* CS 2 Address reg */ +#define MCFSIM_CSMR2 (MCF_MBAR + 0x80)/* CS 2 Mask reg */ +#define MCFSIM_CSCR2 (MCF_MBAR + 0x86)/* CS 2 Control reg */ +#define MCFSIM_CSAR3 (MCF_MBAR + 0x88)/* CS 3 Address reg */ +#define MCFSIM_CSMR3 (MCF_MBAR + 0x8c)/* CS 3 Mask reg */ +#define MCFSIM_CSCR3 (MCF_MBAR + 0x92)/* CS 3 Control reg */ +#define MCFSIM_CSAR4 (MCF_MBAR + 0x94)/* CS 4 Address reg */ +#define MCFSIM_CSMR4 (MCF_MBAR + 0x98)/* CS 4 Mask reg */ +#define MCFSIM_CSCR4 (MCF_MBAR + 0x9e)/* CS 4 Control reg */ +#define MCFSIM_CSAR5 (MCF_MBAR + 0xa0)/* CS 5 Address reg */ +#define MCFSIM_CSMR5 (MCF_MBAR + 0xa4)/* CS 5 Mask reg */ +#define MCFSIM_CSCR5 (MCF_MBAR + 0xaa)/* CS 5 Control reg */ +#define MCFSIM_CSAR6 (MCF_MBAR + 0xac)/* CS 6 Address reg */ +#define MCFSIM_CSMR6 (MCF_MBAR + 0xb0)/* CS 6 Mask reg */ +#define MCFSIM_CSCR6 (MCF_MBAR + 0xb6)/* CS 6 Control reg */ +#define MCFSIM_CSAR7 (MCF_MBAR + 0xb8)/* CS 7 Address reg */ +#define MCFSIM_CSMR7 (MCF_MBAR + 0xbc)/* CS 7 Mask reg */ +#define MCFSIM_CSCR7 (MCF_MBAR + 0xc2)/* CS 7 Control reg */ +#define MCFSIM_DMCR (MCF_MBAR + 0xc6)/* Default control */ #ifdef CONFIG_M5206e#define MCFSIM_PAR (MCF_MBAR + 0xca)/* Pin Assignment */
arch/m68k/include/asm/m5249sim.h +12 -12
@@ -48,18 +48,18 @@#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ #define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ -#define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ -#define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */ -#define MCFSIM_CSCR0 0x8a/* CS 0 Control reg (r/w) */ -#define MCFSIM_CSAR1 0x8c/* CS 1 Address reg (r/w) */ -#define MCFSIM_CSMR1 0x90/* CS 1 Mask reg (r/w) */ -#define MCFSIM_CSCR1 0x96/* CS 1 Control reg (r/w) */ -#define MCFSIM_CSAR2 0x98/* CS 2 Address reg (r/w) */ -#define MCFSIM_CSMR2 0x9c/* CS 2 Mask reg (r/w) */ -#define MCFSIM_CSCR2 0xa2/* CS 2 Control reg (r/w) */ -#define MCFSIM_CSAR3 0xa4/* CS 3 Address reg (r/w) */ -#define MCFSIM_CSMR3 0xa8/* CS 3 Mask reg (r/w) */ -#define MCFSIM_CSCR3 0xae/* CS 3 Control reg (r/w) */ +#define MCFSIM_CSAR0 (MCF_MBAR + 0x80)/* CS 0 Address reg */ +#define MCFSIM_CSMR0 (MCF_MBAR + 0x84)/* CS 0 Mask reg */ +#define MCFSIM_CSCR0 (MCF_MBAR + 0x8a)/* CS 0 Control reg */ +#define MCFSIM_CSAR1 (MCF_MBAR + 0x8c)/* CS 1 Address reg */ +#define MCFSIM_CSMR1 (MCF_MBAR + 0x90)/* CS 1 Mask reg */ +#define MCFSIM_CSCR1 (MCF_MBAR + 0x96)/* CS 1 Control reg */ +#define MCFSIM_CSAR2 (MCF_MBAR + 0x98)/* CS 2 Address reg */ +#define MCFSIM_CSMR2 (MCF_MBAR + 0x9c)/* CS 2 Mask reg */ +#define MCFSIM_CSCR2 (MCF_MBAR + 0xa2)/* CS 2 Control reg */ +#define MCFSIM_CSAR3 (MCF_MBAR + 0xa4)/* CS 3 Address reg */ +#define MCFSIM_CSMR3 (MCF_MBAR + 0xa8)/* CS 3 Mask reg */ +#define MCFSIM_CSCR3 (MCF_MBAR + 0xae)/* CS 3 Control reg */ #define MCFSIM_DCR (MCF_MBAR + 0x100)/* DRAM Control */ #define MCFSIM_DACR0 (MCF_MBAR + 0x108)/* DRAM 0 Addr/Ctrl */
arch/m68k/include/asm/m525xsim.h +15 -15
@@ -46,21 +46,21 @@#define MCFSIM_ICR10 (MCF_MBAR + 0x56)/* Intr Ctrl reg 10 */ #define MCFSIM_ICR11 (MCF_MBAR + 0x57)/* Intr Ctrl reg 11 */ -#define MCFSIM_CSAR0 0x80/* CS 0 Address 0 reg (r/w) */ -#define MCFSIM_CSMR0 0x84/* CS 0 Mask 0 reg (r/w) */ -#define MCFSIM_CSCR0 0x8a/* CS 0 Control reg (r/w) */ -#define MCFSIM_CSAR1 0x8c/* CS 1 Address reg (r/w) */ -#define MCFSIM_CSMR1 0x90/* CS 1 Mask reg (r/w) */ -#define MCFSIM_CSCR1 0x96/* CS 1 Control reg (r/w) */ -#define MCFSIM_CSAR2 0x98/* CS 2 Address reg (r/w) */ -#define MCFSIM_CSMR2 0x9c/* CS 2 Mask reg (r/w) */ -#define MCFSIM_CSCR2 0xa2/* CS 2 Control reg (r/w) */ -#define MCFSIM_CSAR3 0xa4/* CS 3 Address reg (r/w) */ -#define MCFSIM_CSMR3 0xa8/* CS 3 Mask reg (r/w) */ -#define MCFSIM_CSCR3 0xae/* CS 3 Control reg (r/w) */ -#define MCFSIM_CSAR4 0xb0/* CS 4 Address reg (r/w) */ -#define MCFSIM_CSMR4 0xb4/* CS 4 Mask reg (r/w) */ -#define MCFSIM_CSCR4 0xba/* CS 4 Control reg (r/w) */ +#define MCFSIM_CSAR0 (MCF_MBAR + 0x80)/* CS 0 Address reg */ +#define MCFSIM_CSMR0 (MCF_MBAR + 0x84)/* CS 0 Mask reg */ +#define MCFSIM_CSCR0 (MCF_MBAR + 0x8a)/* CS 0 Control reg */ +#define MCFSIM_CSAR1 (MCF_MBAR + 0x8c)/* CS 1 Address reg */ +#define MCFSIM_CSMR1 (MCF_MBAR + 0x90)/* CS 1 Mask reg */ +#define MCFSIM_CSCR1 (MCF_MBAR + 0x96)/* CS 1 Control reg */ +#define MCFSIM_CSAR2 (MCF_MBAR + 0x98)/* CS 2 Address reg */ +#define MCFSIM_CSMR2 (MCF_MBAR + 0x9c)/* CS 2 Mask reg */ +#define MCFSIM_CSCR2 (MCF_MBAR + 0xa2)/* CS 2 Control reg */ +#define MCFSIM_CSAR3 (MCF_MBAR + 0xa4)/* CS 3 Address reg */ +#define MCFSIM_CSMR3 (MCF_MBAR + 0xa8)/* CS 3 Mask reg */ +#define MCFSIM_CSCR3 (MCF_MBAR + 0xae)/* CS 3 Control reg */ +#define MCFSIM_CSAR4 (MCF_MBAR + 0xb0)/* CS 4 Address reg */ +#define MCFSIM_CSMR4 (MCF_MBAR + 0xb4)/* CS 4 Mask reg */ +#define MCFSIM_CSCR4 (MCF_MBAR + 0xba)/* CS 4 Control reg */ #define MCFSIM_DCR (MCF_MBAR + 0x100)/* DRAM Control */ #define MCFSIM_DACR0 (MCF_MBAR + 0x108)/* DRAM 0 Addr/Ctrl */
arch/m68k/include/asm/m5272sim.h +16 -16
@@ -42,22 +42,22 @@#define MCFSIM_WCR (MCF_MBAR + 0x288)/* Watchdog counter */ #define MCFSIM_WER (MCF_MBAR + 0x28c)/* Watchdog event */ -#define MCFSIM_CSBR0 0x40/* CS0 Base Address (r/w) */ -#define MCFSIM_CSOR0 0x44/* CS0 Option (r/w) */ -#define MCFSIM_CSBR1 0x48/* CS1 Base Address (r/w) */ -#define MCFSIM_CSOR1 0x4c/* CS1 Option (r/w) */ -#define MCFSIM_CSBR2 0x50/* CS2 Base Address (r/w) */ -#define MCFSIM_CSOR2 0x54/* CS2 Option (r/w) */ -#define MCFSIM_CSBR3 0x58/* CS3 Base Address (r/w) */ -#define MCFSIM_CSOR3 0x5c/* CS3 Option (r/w) */ -#define MCFSIM_CSBR4 0x60/* CS4 Base Address (r/w) */ -#define MCFSIM_CSOR4 0x64/* CS4 Option (r/w) */ -#define MCFSIM_CSBR5 0x68/* CS5 Base Address (r/w) */ -#define MCFSIM_CSOR5 0x6c/* CS5 Option (r/w) */ -#define MCFSIM_CSBR6 0x70/* CS6 Base Address (r/w) */ -#define MCFSIM_CSOR6 0x74/* CS6 Option (r/w) */ -#define MCFSIM_CSBR7 0x78/* CS7 Base Address (r/w) */ -#define MCFSIM_CSOR7 0x7c/* CS7 Option (r/w) */ +#define MCFSIM_CSBR0 (MCF_MBAR + 0x40)/* CS0 Base Address */ +#define MCFSIM_CSOR0 (MCF_MBAR + 0x44)/* CS0 Option */ +#define MCFSIM_CSBR1 (MCF_MBAR + 0x48)/* CS1 Base Address */ +#define MCFSIM_CSOR1 (MCF_MBAR + 0x4c)/* CS1 Option */ +#define MCFSIM_CSBR2 (MCF_MBAR + 0x50)/* CS2 Base Address */ +#define MCFSIM_CSOR2 (MCF_MBAR + 0x54)/* CS2 Option */ +#define MCFSIM_CSBR3 (MCF_MBAR + 0x58)/* CS3 Base Address */ +#define MCFSIM_CSOR3 (MCF_MBAR + 0x5c)/* CS3 Option */ +#define MCFSIM_CSBR4 (MCF_MBAR + 0x60)/* CS4 Base Address */ +#define MCFSIM_CSOR4 (MCF_MBAR + 0x64)/* CS4 Option */ +#define MCFSIM_CSBR5 (MCF_MBAR + 0x68)/* CS5 Base Address */ +#define MCFSIM_CSOR5 (MCF_MBAR + 0x6c)/* CS5 Option */ +#define MCFSIM_CSBR6 (MCF_MBAR + 0x70)/* CS6 Base Address */ +#define MCFSIM_CSOR6 (MCF_MBAR + 0x74)/* CS6 Option */ +#define MCFSIM_CSBR7 (MCF_MBAR + 0x78)/* CS7 Base Address */ +#define MCFSIM_CSOR7 (MCF_MBAR + 0x7c)/* CS7 Option */ #define MCFSIM_SDCR 0x180/* SDRAM Configuration (r/w) */ #define MCFSIM_SDTR 0x184/* SDRAM Timing (r/w) */
arch/m68k/include/asm/m5307sim.h +38 -38
85 lines not on this page · raw message
arch/m68k/include/asm/m5407sim.h +25 -25
56 lines not on this page · raw message
arch/m68k/platform/coldfire/head.S +1 -1
@@ -60,7 +60,7 @@ #elif defined(CONFIG_M5272) .macro GET_MEM_SIZE - movel MCF_MBAR+MCFSIM_CSOR7,%d0 /* get SDRAM address mask */ + movel MCFSIM_CSOR7,%d0 /* get SDRAM address mask */ andil #0xfffff000,%d0 /* mask out chip select options */ negl %d0 /* negate bits */ .endm
arch/m68k/platform/coldfire/nettel.c +2 -2
@@ -121,14 +121,14 @@ static void __init nettel_smc91x_setmac(unsigned int ioaddr, unsigned int flashastatic void __init nettel_smc91x_init (void ) { -writew (0x00ec ,MCF_MBAR +MCFSIM_PADDR ); +writew (0x00ec ,MCFSIM_PADDR );mcf_setppdata (0 ,0x0080 );writew (1 ,NETTEL_SMC0_ADDR + SMC91xx_BANKSELECT);writew (0x0067 ,NETTEL_SMC0_ADDR + SMC91xx_BASEADDR);mcf_setppdata (0x0080 ,0 );/* Set correct chip select timing for SMC9196 accesses */ -writew (0x1180 ,MCF_MBAR +MCFSIM_CSCR3 ); +writew (0x1180 ,MCFSIM_CSCR3 );/* Set the SMC interrupts to be auto-vectored */ mcf_autovector (NETTEL_SMC0_IRQ );
Signature · 1 line
1.7.0.4
PATCH 7/9 m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
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.
--- arch/m68k/include/asm/m5249sim.h | 4 ++-- arch/m68k/include/asm/m525xsim.h | 2 +- arch/m68k/include/asm/m5307sim.h | 6 +++--- arch/m68k/include/asm/m5407sim.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)
arch/m68k/include/asm/m5249sim.h +2 -2
@@ -30,8 +30,8 @@#define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ #define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog srv */ #define MCFSIM_PAR (MCF_MBAR + 0x04)/* Pin Assignment */ -#define MCFSIM_IRQPAR 0x06/* Interrupt Assignment reg (r/w) */ -#define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ +#define MCFSIM_IRQPAR (MCF_MBAR + 0x06)/* Intr Assignment */ +#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 */
arch/m68k/include/asm/m525xsim.h +1 -1
@@ -30,7 +30,7 @@#define MCFSIM_SYPCR (MCF_MBAR + 0x01)/* System Protection */ #define MCFSIM_SWIVR (MCF_MBAR + 0x02)/* SW Watchdog intr */ #define MCFSIM_SWSR (MCF_MBAR + 0x03)/* SW Watchdog srv */ -#define MCFSIM_MPARK 0x0C/* BUS Master Control Reg*/ +#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_ICR0 (MCF_MBAR + 0x4c)/* Intr Ctrl reg 0 */
arch/m68k/include/asm/m5307sim.h +3 -3
@@ -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)/* Itr Assignment */ +#define MCFSIM_PLLCR (MCF_MBAR + 0x08)/* PLL Ctrl Reg */ +#define MCFSIM_MPARK (MCF_MBAR + 0x0C)/* BUS Master Ctrl */ #define MCFSIM_IPR (MCF_MBAR + 0x40)/* Interrupt Pend */ #define MCFSIM_IMR (MCF_MBAR + 0x44)/* Interrupt Mask */ #define MCFSIM_AVR (MCF_MBAR + 0x4b)/* Autovector Ctrl */
arch/m68k/include/asm/m5407sim.h +3 -3
@@ -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 */
Signature · 1 line
1.7.0.4
PATCH 8/9 m68knommu: make remaining ColdFire 5272 register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make the remaining definitions of the 5272 ColdFire 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.
--- arch/m68k/include/asm/m5272sim.h | 26 +++++++++++++------------- arch/m68k/platform/coldfire/m5272.c | 5 +---- 2 files changed, 14 insertions(+), 17 deletions(-)
arch/m68k/include/asm/m5272sim.h +13 -13
@@ -21,11 +21,11 @@/* * Define the 5272 SIM register set addresses. */ -#define MCFSIM_SCR 0x04/* SIM Config reg (r/w) */ -#define MCFSIM_SPR 0x06/* System Protection reg (r/w)*/ -#define MCFSIM_PMR 0x08/* Power Management reg (r/w) */ -#define MCFSIM_APMR 0x0e/* Active Low Power reg (r/w) */ -#define MCFSIM_DIR 0x10/* Device Identity reg (r/w) */ +#define MCFSIM_SCR (MCF_MBAR + 0x04)/* SIM Config reg */ +#define MCFSIM_SPR (MCF_MBAR + 0x06)/* System Protection */ +#define MCFSIM_PMR (MCF_MBAR + 0x08)/* Power Management */ +#define MCFSIM_APMR (MCF_MBAR + 0x0e)/* Active Low Power */ +#define MCFSIM_DIR (MCF_MBAR + 0x10)/* Device Identity */ #define MCFSIM_ICR1 (MCF_MBAR + 0x20)/* Intr Ctrl reg 1 */ #define MCFSIM_ICR2 (MCF_MBAR + 0x24)/* Intr Ctrl reg 2 */
@@ -59,14 +59,14 @@#define MCFSIM_CSBR7 (MCF_MBAR + 0x78)/* CS7 Base Address */ #define MCFSIM_CSOR7 (MCF_MBAR + 0x7c)/* CS7 Option */ -#define MCFSIM_SDCR 0x180/* SDRAM Configuration (r/w) */ -#define MCFSIM_SDTR 0x184/* SDRAM Timing (r/w) */ -#define MCFSIM_DCAR0 0x4c/* DRAM 0 Address reg(r/w) */ -#define MCFSIM_DCMR0 0x50/* DRAM 0 Mask reg (r/w) */ -#define MCFSIM_DCCR0 0x57/* DRAM 0 Control reg (r/w) */ -#define MCFSIM_DCAR1 0x58/* DRAM 1 Address reg (r/w) */ -#define MCFSIM_DCMR1 0x5c/* DRAM 1 Mask reg (r/w) */ -#define MCFSIM_DCCR1 0x63/* DRAM 1 Control reg (r/w) */ +#define MCFSIM_SDCR (MCF_MBAR + 0x180)/* SDRAM Config */ +#define MCFSIM_SDTR (MCF_MBAR + 0x184)/* SDRAM Timing */ +#define MCFSIM_DCAR0 (MCF_MBAR + 0x4c)/* DRAM 0 Address */ +#define MCFSIM_DCMR0 (MCF_MBAR + 0x50)/* DRAM 0 Mask */ +#define MCFSIM_DCCR0 (MCF_MBAR + 0x57)/* DRAM 0 Control */ +#define MCFSIM_DCAR1 (MCF_MBAR + 0x58)/* DRAM 1 Address */ +#define MCFSIM_DCMR1 (MCF_MBAR + 0x5c)/* DRAM 1 Mask reg */ +#define MCFSIM_DCCR1 (MCF_MBAR + 0x63)/* DRAM 1 Control */ #define MCFUART_BASE0 (MCF_MBAR + 0x100)/* Base address UART0 */ #define MCFUART_BASE1 (MCF_MBAR + 0x140)/* Base address UART1 */
arch/m68k/platform/coldfire/m5272.c +1 -4
@@ -62,11 +62,8 @@ static void m5272_cpu_reset(void)void __init config_BSP (char *commandp,int size) {#if defined (CONFIG_MOD5272 ) -volatile unsigned char *pivrp; -/* Set base of device vectors to be 64 */ - pivrp = (volatile unsigned char *) (MCF_MBAR +MCFSIM_PIVR ); - *pivrp =0x40 ; +writeb (0x40 ,MCFSIM_PIVR );#endif #if defined(CONFIG_NETtel) || defined(CONFIG_SCALES )
Signature · 1 line
1.7.0.4
PATCH 9/9 m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses
In reply to [email protected]From: Greg Ungerer <[email protected]>
Make the ColdFire 5249 MBAR peripheral register definitions absolute addresses, instead of offsets into the 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.
--- arch/m68k/include/asm/m5249sim.h | 34 +++++++++++++++--------------- arch/m68k/platform/coldfire/intc-5249.c | 10 ++++---- arch/m68k/platform/coldfire/m5249.c | 8 +++--- 3 files changed, 26 insertions(+), 26 deletions(-)
arch/m68k/include/asm/m5249sim.h +17 -17
@@ -134,23 +134,23 @@#define MCFSIM2_GPIO1ENABLE (MCF_MBAR2 + 0x0B8)/* GPIO1 enabled */ #define MCFSIM2_GPIO1FUNC (MCF_MBAR2 + 0x0BC)/* GPIO1 function */ -#define MCFSIM2_GPIOINTSTAT 0xc0/* GPIO interrupt status */ -#define MCFSIM2_GPIOINTCLEAR 0xc0/* GPIO interrupt clear */ -#define MCFSIM2_GPIOINTENABLE 0xc4/* GPIO interrupt enable */ - -#define MCFSIM2_INTLEVEL1 0x140/* Interrupt level reg 1 */ -#define MCFSIM2_INTLEVEL2 0x144/* Interrupt level reg 2 */ -#define MCFSIM2_INTLEVEL3 0x148/* Interrupt level reg 3 */ -#define MCFSIM2_INTLEVEL4 0x14c/* Interrupt level reg 4 */ -#define MCFSIM2_INTLEVEL5 0x150/* Interrupt level reg 5 */ -#define MCFSIM2_INTLEVEL6 0x154/* Interrupt level reg 6 */ -#define MCFSIM2_INTLEVEL7 0x158/* Interrupt level reg 7 */ -#define MCFSIM2_INTLEVEL8 0x15c/* Interrupt level reg 8 */ - -#define MCFSIM2_DMAROUTE 0x188/* DMA routing */ - -#define MCFSIM2_IDECONFIG1 0x18c/* IDEconfig1 */ -#define MCFSIM2_IDECONFIG2 0x190/* IDEconfig2 */ +#define MCFSIM2_GPIOINTSTAT (MCF_MBAR2 + 0xc0)/* GPIO intr status */ +#define MCFSIM2_GPIOINTCLEAR (MCF_MBAR2 + 0xc0)/* GPIO intr clear */ +#define MCFSIM2_GPIOINTENABLE (MCF_MBAR2 + 0xc4)/* GPIO intr enable */ + +#define MCFSIM2_INTLEVEL1 (MCF_MBAR2 + 0x140)/* Intr level reg 1 */ +#define MCFSIM2_INTLEVEL2 (MCF_MBAR2 + 0x144)/* Intr level reg 2 */ +#define MCFSIM2_INTLEVEL3 (MCF_MBAR2 + 0x148)/* Intr level reg 3 */ +#define MCFSIM2_INTLEVEL4 (MCF_MBAR2 + 0x14c)/* Intr level reg 4 */ +#define MCFSIM2_INTLEVEL5 (MCF_MBAR2 + 0x150)/* Intr level reg 5 */ +#define MCFSIM2_INTLEVEL6 (MCF_MBAR2 + 0x154)/* Intr level reg 6 */ +#define MCFSIM2_INTLEVEL7 (MCF_MBAR2 + 0x158)/* Intr level reg 7 */ +#define MCFSIM2_INTLEVEL8 (MCF_MBAR2 + 0x15c)/* Intr level reg 8 */ + +#define MCFSIM2_DMAROUTE (MCF_MBAR2 + 0x188)/* DMA routing */ + +#define MCFSIM2_IDECONFIG1 (MCF_MBAR2 + 0x18c)/* IDEconfig1 */ +#define MCFSIM2_IDECONFIG2 (MCF_MBAR2 + 0x190)/* IDEconfig2 */ /* * Define the base interrupt for the second interrupt controller.
arch/m68k/platform/coldfire/intc-5249.c +5 -5
@@ -20,22 +20,22 @@static void intc2_irq_gpio_mask (struct irq_data *d) {u32 imr; - imr =readl (MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); + imr =readl (MCFSIM2_GPIOINTENABLE ); imr &= ~(0x1 << (d->irq -MCFINTC2_GPIOIRQ0 )); -writel (imr,MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); +writel (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_unmask (struct irq_data *d) {u32 imr; - imr =readl (MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); + imr =readl (MCFSIM2_GPIOINTENABLE ); imr |= (0x1 << (d->irq -MCFINTC2_GPIOIRQ0 )); -writel (imr,MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); +writel (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_ack (struct irq_data *d) { -writel (0x1 << (d->irq -MCFINTC2_GPIOIRQ0 ),MCF_MBAR2 +MCFSIM2_GPIOINTCLEAR ); +writel (0x1 << (d->irq -MCFINTC2_GPIOIRQ0 ),MCFSIM2_GPIOINTCLEAR ); }static struct irq_chip intc2_irq_gpio_chip = {
arch/m68k/platform/coldfire/m5249.c +4 -4
@@ -72,11 +72,11 @@ static void __init m5249_smc91x_init(void)u32 gpio;/* Set the GPIO line as interrupt source for smc91x device */ - gpio =readl (MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); -writel (gpio |0x40 ,MCF_MBAR2 +MCFSIM2_GPIOINTENABLE ); + gpio =readl (MCFSIM2_GPIOINTENABLE ); +writel (gpio |0x40 ,MCFSIM2_GPIOINTENABLE ); - gpio =readl (MCF_MBAR2 +MCFSIM2_INTLEVEL5 ); - writel(gpio | 0x04000000, MCF_MBAR2 + MCFSIM2_INTLEVEL5); + gpio =readl (MCFSIM2_INTLEVEL5 ); + writel(gpio | 0x04000000, MCFSIM2_INTLEVEL5); }#endif /* CONFIG_M5249C3 */
Signature · 1 line
1.7.0.4