Commit 7b562d0f authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx3/kzm_arm11_01: fold board header in its only user 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 5d3a136a

arch/arm/mach-mx3/mach-kzm_arm11_01.c

+17 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include <mach/board-kzmarm11.h>

#include <mach/clock.h>

#include <mach/common.h>

#include <mach/imx-uart.h>
@@ -51,6 +50,23 @@ 
	IMX_IO_ADDRESS(x, MX31_CS5) ?:					\

	MX31_IO_ADDRESS(x))



/*

 *  KZM-ARM11-01 Board Control Registers on FPGA

 */

#define KZM_ARM11_CTL1		(MX31_CS4_BASE_ADDR + 0x1000)

#define KZM_ARM11_CTL2		(MX31_CS4_BASE_ADDR + 0x1001)

#define KZM_ARM11_RSW1		(MX31_CS4_BASE_ADDR + 0x1002)

#define KZM_ARM11_BACK_LIGHT	(MX31_CS4_BASE_ADDR + 0x1004)

#define KZM_ARM11_FPGA_REV	(MX31_CS4_BASE_ADDR + 0x1008)

#define KZM_ARM11_7SEG_LED	(MX31_CS4_BASE_ADDR + 0x1010)

#define KZM_ARM11_LEDS		(MX31_CS4_BASE_ADDR + 0x1020)

#define KZM_ARM11_DIPSW2	(MX31_CS4_BASE_ADDR + 0x1003)



/*

 * External UART for touch panel on FPGA

 */

#define KZM_ARM11_16550		(MX31_CS4_BASE_ADDR + 0x1050)



#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)

/*

 * KZM-ARM11-01 has an external UART on FPGA

arch/arm/plat-mxc/include/mach/board-kzmarm11.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2009  Yoichi Yuasa <yuasa@linux-mips.org>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 */

#ifndef __ARM_ARCH_BOARD_KZM_ARM11_H

#define __ARM_ARCH_BOARD_KZM_ARM11_H



/*

 *  KZM-ARM11-01 Board Control Registers on FPGA

 */

#define KZM_ARM11_CTL1		(MX31_CS4_BASE_ADDR + 0x1000)

#define KZM_ARM11_CTL2		(MX31_CS4_BASE_ADDR + 0x1001)

#define KZM_ARM11_RSW1		(MX31_CS4_BASE_ADDR + 0x1002)

#define KZM_ARM11_BACK_LIGHT	(MX31_CS4_BASE_ADDR + 0x1004)

#define KZM_ARM11_FPGA_REV	(MX31_CS4_BASE_ADDR + 0x1008)

#define KZM_ARM11_7SEG_LED	(MX31_CS4_BASE_ADDR + 0x1010)

#define KZM_ARM11_LEDS		(MX31_CS4_BASE_ADDR + 0x1020)

#define KZM_ARM11_DIPSW2	(MX31_CS4_BASE_ADDR + 0x1003)



/*

 * External UART for touch panel on FPGA

 */

#define KZM_ARM11_16550		(MX31_CS4_BASE_ADDR + 0x1050)



#endif /* __ARM_ARCH_BOARD_KZM_ARM11_H */