summaryrefslogtreecommitdiff
path: root/arch/arm/mach-zynq/board_dt.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-07 11:35:20 +0000
committerArnd Bergmann <arnd@arndb.de>2011-07-07 14:13:58 +0000
commit3d64b4496f5fd90618106555344205a522178c0c (patch)
tree068d35fbfa11ac0553561b2ec5fec70d0d987ab6 /arch/arm/mach-zynq/board_dt.c
parentb85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 (diff)
ARM: Xilinx: merge board file into main platform code
The zynq platform will never have board files other than the device tree one, so there is no point splitting it from common.c. This makes the code more compact. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: John Linn <john.linn@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq/board_dt.c')
-rw-r--r--arch/arm/mach-zynq/board_dt.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-zynq/board_dt.c b/arch/arm/mach-zynq/board_dt.c
index 5b4710d09258..e69de29bb2d1 100644
--- a/arch/arm/mach-zynq/board_dt.c
+++ b/arch/arm/mach-zynq/board_dt.c
@@ -1,37 +0,0 @@
-/*
- * This file contains code for boards with device tree support.
- *
- * Copyright (C) 2011 Xilinx
- *
- * based on arch/arm/mach-realview/core.c
- *
- * Copyright (C) 1999 - 2003 ARM Limited
- * Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
-
-#include <linux/of.h>
-#include <asm/mach/arch.h>
-#include <asm/mach-types.h>
-#include "common.h"
-
-static const char *xilinx_dt_match[] = {
- "xlnx,zynq-ep107",
- NULL
-};
-
-MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
- .map_io = xilinx_map_io,
- .init_irq = xilinx_irq_init,
- .init_machine = xilinx_init_machine,
- .timer = &xttcpss_sys_timer,
- .dt_compat = xilinx_dt_match,
-MACHINE_END