Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: Xilinx: merge board file into main platform code

Browse source 
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>
This commit is contained in:
Arnd Bergmann 2011-07-07 11:35:20 +00:00
parent b85a3ef4ac
commit 3d64b4496f
3 changed files with 19 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
arch/arm/mach-zynq/board_dt.c
View file

@ -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

22
arch/arm/mach-zynq/common.c
View file

@ -21,8 +21,11 @@
#include <linux/clk.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/of.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/page.h>
#include <asm/hardware/gic.h>
#include <asm/hardware/cache-l2x0.h>
@ -40,7 +43,7 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = {
* xilinx_init_machine() - System specific initialization, intended to be
* called from board specific initialization.
*/
void __init xilinx_init_machine(void)
static void __init xilinx_init_machine(void)
{
#ifdef CONFIG_CACHE_L2X0
/*
@ -55,7 +58,7 @@ void __init xilinx_init_machine(void)
/**
* xilinx_irq_init() - Interrupt controller initialization for the GIC.
*/
void __init xilinx_irq_init(void)
static void __init xilinx_irq_init(void)
{
gic_init(0, 29, SCU_GIC_DIST_BASE, SCU_GIC_CPU_BASE);
}
@ -96,7 +99,20 @@ static struct map_desc io_desc[] __initdata = {
/**
* xilinx_map_io() - Create memory mappings needed for early I/O.
*/
void __init xilinx_map_io(void)
static void __init xilinx_map_io(void)
{
iotable_init(io_desc, ARRAY_SIZE(io_desc));
}
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

5
arch/arm/mach-zynq/common.h
View file

@ -17,13 +17,8 @@
#ifndef __MACH_ZYNQ_COMMON_H__
#define __MACH_ZYNQ_COMMON_H__
#include <linux/init.h>
#include <asm/mach/time.h>
extern void xilinx_init_machine(void);
extern void xilinx_irq_init(void);
extern void xilinx_map_io(void);
extern struct sys_timer xttcpss_sys_timer;
#endif