From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 03/23] m68knommu: make 523x UART platform addressing consistent
Date: Thu, 23 Feb 2012 14:34:35 +1000 [thread overview]
Message-ID: <1329971695-2203-4-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1329971695-2203-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
If we make all UART addressing consistent across all ColdFire family members
then we will be able to remove the duplicated plaform data and use a single
setup for all.
So modify the ColdFire 523x UART addressing so that:
. UARTs are numbered from 0 up
. use a common name for IRQs used
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/m523xsim.h | 12 +++++++++---
arch/m68k/platform/523x/config.c | 12 ++++++------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
index 6235921..919d115 100644
--- a/arch/m68k/include/asm/m523xsim.h
+++ b/arch/m68k/include/asm/m523xsim.h
@@ -35,9 +35,15 @@
#define MCFINT_VECBASE 64 /* Vector base number */
#define MCFINT_UART0 13 /* Interrupt number for UART0 */
+#define MCFINT_UART1 14 /* Interrupt number for UART1 */
+#define MCFINT_UART2 15 /* Interrupt number for UART2 */
#define MCFINT_PIT1 36 /* Interrupt number for PIT1 */
#define MCFINT_QSPI 18 /* Interrupt number for QSPI */
+#define MCF_IRQ_UART0 (MCFINT_VECBASE + MCFINT_UART0)
+#define MCF_IRQ_UART1 (MCFINT_VECBASE + MCFINT_UART1)
+#define MCF_IRQ_UART2 (MCFINT_VECBASE + MCFINT_UART2)
+
/*
* SDRAM configuration registers.
*/
@@ -59,9 +65,9 @@
/*
* UART module.
*/
-#define MCFUART_BASE1 (MCF_IPSBAR + 0x200)
-#define MCFUART_BASE2 (MCF_IPSBAR + 0x240)
-#define MCFUART_BASE3 (MCF_IPSBAR + 0x280)
+#define MCFUART_BASE0 (MCF_IPSBAR + 0x200)
+#define MCFUART_BASE1 (MCF_IPSBAR + 0x240)
+#define MCFUART_BASE2 (MCF_IPSBAR + 0x280)
/*
* FEC ethernet module.
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 71f4436..c01d0ae 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -28,16 +28,16 @@
static struct mcf_platform_uart m523x_uart_platform[] = {
{
- .mapbase = MCFUART_BASE1,
- .irq = MCFINT_VECBASE + MCFINT_UART0,
+ .mapbase = MCFUART_BASE0,
+ .irq = MCF_IRQ_UART0,
},
{
- .mapbase = MCFUART_BASE2,
- .irq = MCFINT_VECBASE + MCFINT_UART0 + 1,
+ .mapbase = MCFUART_BASE1,
+ .irq = MCF_IRQ_UART1,
},
{
- .mapbase = MCFUART_BASE3,
- .irq = MCFINT_VECBASE + MCFINT_UART0 + 2,
+ .mapbase = MCFUART_BASE2,
+ .irq = MCF_IRQ_UART2,
},
{ },
};
--
1.7.0.4
next prev parent reply other threads:[~2012-02-23 4:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 4:34 [PATCH 00/23] m68knommu: clean up and merge common ColdFire UART code gerg
2012-02-23 4:34 ` [PATCH 01/23] m68knommu: make 5206 UART platform addressing consistent gerg
2012-02-23 4:34 ` [PATCH 02/23] m68knommu: make 520x " gerg
2012-02-23 4:34 ` gerg [this message]
2012-02-23 4:34 ` [PATCH 04/23] m68knommu: make 5249 " gerg
2012-02-23 4:34 ` [PATCH 05/23] m68knommu: make 5272 " gerg
2012-02-23 4:34 ` [PATCH 06/23] m68knommu: make 527x " gerg
2012-02-23 4:34 ` [PATCH 07/23] m68knommu: make 5307 " gerg
2012-02-23 4:34 ` [PATCH 08/23] m68knommu: make 528x " gerg
2012-02-23 4:34 ` [PATCH 09/23] m68knommu: make 532x " gerg
2012-02-23 4:34 ` [PATCH 10/23] m68knommu: make 5407 " gerg
2012-02-23 4:34 ` [PATCH 11/23] m68knommu: make 54xx " gerg
2012-02-23 4:34 ` [PATCH 12/23] m68knommu: simplify the 5206 UART setup code gerg
2012-02-23 4:34 ` [PATCH 13/23] m68knommu: simplify the 520x " gerg
2012-02-23 4:34 ` [PATCH 14/23] m68knommu: simplify the 5249 " gerg
2012-02-23 4:34 ` [PATCH 15/23] m68knommu: simplify the 5272 " gerg
2012-02-23 4:34 ` [PATCH 16/23] m68knommu: simplify the 527x " gerg
2012-02-23 4:34 ` [PATCH 17/23] m68knommu: simplify the 528x " gerg
2012-02-23 4:34 ` [PATCH 18/23] m68knommu: simplify the 5307 " gerg
2012-02-23 4:34 ` [PATCH 19/23] m68knommu: simplify the 532x " gerg
2012-02-23 4:34 ` [PATCH 20/23] m68knommu: simplify the 5407 " gerg
2012-02-23 4:34 ` [PATCH 21/23] m68knommu: simplify the 54xx " gerg
2012-02-23 4:34 ` [PATCH 22/23] m68knommu: merge common ColdFire UART platform " gerg
2012-02-23 4:34 ` [PATCH 23/23] m68knommu: merge common ColdFire UART IRQ setup gerg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329971695-2203-4-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
--cc=uclinux-dev@uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox