diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:02:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:02:36 -0400 |
| commit | e34551339a195aa548eaf698523714a8fe7f1984 (patch) | |
| tree | 8319ac8492bc1bf6dd6182cbcb9002b2aeb82d63 /arch/m68knommu/platform/523x/config.c | |
| parent | 242e5d06be2ad2633c85313a37862e03f4450a46 (diff) | |
| parent | 47e0c7e128afb85cf4fb7792e6e7fcb91e2a5cc4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits)
m68knommu: external interrupt support to ColdFire intc-simr controller
m68knommu: external interrupt support to ColdFire intc-2 controller
m68knommu: remove ColdFire CLOCK_DIV config option
m68knommu: fix gpio warnings for ColdFire 5407 targets
m68knommu: fix gpio warnings for ColdFire 532x targets
m68knommu: fix gpio warnings for ColdFire 5307 targets
m68knommu: fix gpio warnings for ColdFire 527x targets
m68knommu: fix gpio warnings for ColdFire 5272 targets
m68knommu: fix gpio warnings for ColdFire 5249 targets
m68knommu: fix gpio warnings for ColdFire 523x targets
m68knommu: fix gpio warnings for ColdFire 520x targets
m68knommu: fix gpio warnings for ColdFire 5206e targets
m68knommu: fix gpio warnings for ColdFire 5206 targets
m68knommu: fixing compiler warnings
m68knommu: limit interrupts supported by ColdFire intc-simr driver
m68knommu: move some init code out of unmask routine for ColdFire intc-2
m68knommu: limit interrupts supported by ColdFire intc-2 driver
m68knommu: add basic support for the ColdFire based FireBee board
m68knommu: make ColdFire internal peripheral region configurable
m68knommu: clean up definitions of ColdFire peripheral base registers
...
Diffstat (limited to 'arch/m68knommu/platform/523x/config.c')
| -rw-r--r-- | arch/m68knommu/platform/523x/config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c index 8980f6d7715a..418a76feb1e3 100644 --- a/arch/m68knommu/platform/523x/config.c +++ b/arch/m68knommu/platform/523x/config.c | |||
| @@ -28,15 +28,15 @@ | |||
| 28 | 28 | ||
| 29 | static struct mcf_platform_uart m523x_uart_platform[] = { | 29 | static struct mcf_platform_uart m523x_uart_platform[] = { |
| 30 | { | 30 | { |
| 31 | .mapbase = MCF_MBAR + MCFUART_BASE1, | 31 | .mapbase = MCFUART_BASE1, |
| 32 | .irq = MCFINT_VECBASE + MCFINT_UART0, | 32 | .irq = MCFINT_VECBASE + MCFINT_UART0, |
| 33 | }, | 33 | }, |
| 34 | { | 34 | { |
| 35 | .mapbase = MCF_MBAR + MCFUART_BASE2, | 35 | .mapbase = MCFUART_BASE2, |
| 36 | .irq = MCFINT_VECBASE + MCFINT_UART0 + 1, | 36 | .irq = MCFINT_VECBASE + MCFINT_UART0 + 1, |
| 37 | }, | 37 | }, |
| 38 | { | 38 | { |
| 39 | .mapbase = MCF_MBAR + MCFUART_BASE3, | 39 | .mapbase = MCFUART_BASE3, |
| 40 | .irq = MCFINT_VECBASE + MCFINT_UART0 + 2, | 40 | .irq = MCFINT_VECBASE + MCFINT_UART0 + 2, |
| 41 | }, | 41 | }, |
| 42 | { }, | 42 | { }, |
| @@ -50,8 +50,8 @@ static struct platform_device m523x_uart = { | |||
| 50 | 50 | ||
| 51 | static struct resource m523x_fec_resources[] = { | 51 | static struct resource m523x_fec_resources[] = { |
| 52 | { | 52 | { |
| 53 | .start = MCF_MBAR + 0x1000, | 53 | .start = MCFFEC_BASE, |
| 54 | .end = MCF_MBAR + 0x1000 + 0x7ff, | 54 | .end = MCFFEC_BASE + MCFFEC_SIZE - 1, |
| 55 | .flags = IORESOURCE_MEM, | 55 | .flags = IORESOURCE_MEM, |
| 56 | }, | 56 | }, |
| 57 | { | 57 | { |