aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-03-08 05:58:53 -0500
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-24 09:40:29 -0400
commit7b562d0f21b58195596d4800466221e7808d180e (patch)
tree26c2977f64c016fb41e62ef649b69ae1f72ddb50 /arch/arm/mach-mx3
parent5d3a136a0896c7939e0a8ad44f191be09fd31bcb (diff)
ARM: mx3/kzm_arm11_01: fold board header in its only user
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mach-kzm_arm11_01.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
index f085d5d1a6de..e60f5da1dee4 100644
--- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
@@ -37,7 +37,6 @@
37#include <asm/mach/map.h> 37#include <asm/mach/map.h>
38#include <asm/mach/time.h> 38#include <asm/mach/time.h>
39 39
40#include <mach/board-kzmarm11.h>
41#include <mach/clock.h> 40#include <mach/clock.h>
42#include <mach/common.h> 41#include <mach/common.h>
43#include <mach/imx-uart.h> 42#include <mach/imx-uart.h>
@@ -51,6 +50,23 @@
51 IMX_IO_ADDRESS(x, MX31_CS5) ?: \ 50 IMX_IO_ADDRESS(x, MX31_CS5) ?: \
52 MX31_IO_ADDRESS(x)) 51 MX31_IO_ADDRESS(x))
53 52
53/*
54 * KZM-ARM11-01 Board Control Registers on FPGA
55 */
56#define KZM_ARM11_CTL1 (MX31_CS4_BASE_ADDR + 0x1000)
57#define KZM_ARM11_CTL2 (MX31_CS4_BASE_ADDR + 0x1001)
58#define KZM_ARM11_RSW1 (MX31_CS4_BASE_ADDR + 0x1002)
59#define KZM_ARM11_BACK_LIGHT (MX31_CS4_BASE_ADDR + 0x1004)
60#define KZM_ARM11_FPGA_REV (MX31_CS4_BASE_ADDR + 0x1008)
61#define KZM_ARM11_7SEG_LED (MX31_CS4_BASE_ADDR + 0x1010)
62#define KZM_ARM11_LEDS (MX31_CS4_BASE_ADDR + 0x1020)
63#define KZM_ARM11_DIPSW2 (MX31_CS4_BASE_ADDR + 0x1003)
64
65/*
66 * External UART for touch panel on FPGA
67 */
68#define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050)
69
54#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) 70#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)
55/* 71/*
56 * KZM-ARM11-01 has an external UART on FPGA 72 * KZM-ARM11-01 has an external UART on FPGA