mirror of https://gitee.com/openkylin/linux.git
ARM: clps711x: merge files related to EDB7211-board into one
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Alexander Shiyan
Arnd Bergmann
parent
658b14627c
commit
2a5528912d
|
|
@ -12,6 +12,6 @@ obj- :=
|
|||
obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o
|
||||
obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o
|
||||
obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o
|
||||
obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o
|
||||
obj-$(CONFIG_ARCH_EDB7211) += edb7211.o
|
||||
obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o
|
||||
obj-$(CONFIG_ARCH_P720T) += p720t.o
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
/*
|
||||
* linux/arch/arm/mach-clps711x/mm.c
|
||||
*
|
||||
* Extra MM routines for the EDB7211 board
|
||||
*
|
||||
* Copyright (C) 2000, 2001 Blue Mug, Inc. All Rights Reserved.
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/bug.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/sizes.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
extern void clps711x_map_io(void);
|
||||
|
||||
/*
|
||||
* The on-chip registers are given a size of 1MB so that a section can
|
||||
* be used to map them; this saves a page table. This is the place to
|
||||
* add mappings for ROM, expansion memory, PCMCIA, etc. (if static
|
||||
* mappings are chosen for those areas).
|
||||
*
|
||||
* Here is a physical memory map (to be fleshed out later):
|
||||
*
|
||||
* Physical Address Size Description
|
||||
* ----------------- ----- ---------------------------------
|
||||
* c0000000-c001ffff 128KB reserved for video RAM [1]
|
||||
* c0020000-c0023fff 16KB parameters (see Documentation/arm/Setup)
|
||||
* c0024000-c0027fff 16KB swapper_pg_dir (task 0 page directory)
|
||||
* c0028000-... kernel image (TEXTADDR)
|
||||
*
|
||||
* [1] Unused pages should be given back to the VM; they are not yet.
|
||||
* The parameter block should also be released (not sure if this
|
||||
* happens).
|
||||
*/
|
||||
static struct map_desc edb7211_io_desc[] __initdata = {
|
||||
{ /* Memory-mapped extra keyboard row */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_EXTKBD),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD),
|
||||
.length = SZ_1M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* CS8900A Ethernet chip */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_CS8900A),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_CS8900A),
|
||||
.length = SZ_1M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* Flash bank 0 */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_FLASH1),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH1),
|
||||
.length = SZ_8M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* Flash bank 1 */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_FLASH2),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH2),
|
||||
.length = SZ_8M,
|
||||
.type = MT_DEVICE,
|
||||
}
|
||||
};
|
||||
|
||||
void __init edb7211_map_io(void)
|
||||
{
|
||||
clps711x_map_io();
|
||||
iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
|
||||
}
|
||||
|
||||
|
|
@ -1,39 +1,61 @@
|
|||
/*
|
||||
* linux/arch/arm/mach-clps711x/arch-edb7211.c
|
||||
*
|
||||
* Copyright (C) 2000, 2001 Blue Mug, Inc. All Rights Reserved.
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/memblock.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
#include <asm/setup.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
extern void edb7211_map_io(void);
|
||||
#define VIDEORAM_SIZE SZ_128K
|
||||
|
||||
static struct map_desc edb7211_io_desc[] __initdata = {
|
||||
{ /* Memory-mapped extra keyboard row */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_EXTKBD),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD),
|
||||
.length = SZ_1M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* CS8900A Ethernet chip */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_CS8900A),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_CS8900A),
|
||||
.length = SZ_1M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* Flash bank 0 */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_FLASH1),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH1),
|
||||
.length = SZ_8M,
|
||||
.type = MT_DEVICE,
|
||||
}, { /* Flash bank 1 */
|
||||
.virtual = IO_ADDRESS(EP7211_PHYS_FLASH2),
|
||||
.pfn = __phys_to_pfn(EP7211_PHYS_FLASH2),
|
||||
.length = SZ_8M,
|
||||
.type = MT_DEVICE,
|
||||
},
|
||||
};
|
||||
|
||||
void __init edb7211_map_io(void)
|
||||
{
|
||||
clps711x_map_io();
|
||||
iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
|
||||
}
|
||||
|
||||
/* Reserve screen memory region at the start of main system memory. */
|
||||
static void __init edb7211_reserve(void)
|
||||
{
|
||||
memblock_reserve(PHYS_OFFSET, 0x00020000);
|
||||
memblock_reserve(PHYS_OFFSET, VIDEORAM_SIZE);
|
||||
}
|
||||
|
||||
static void __init
|
||||
|
|
@ -48,15 +70,15 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
|
|||
* not using that information yet.
|
||||
*/
|
||||
mi->bank[0].start = 0xc0000000;
|
||||
mi->bank[0].size = 8*1024*1024;
|
||||
mi->bank[0].size = SZ_8M;
|
||||
mi->bank[1].start = 0xc1000000;
|
||||
mi->bank[1].size = 8*1024*1024;
|
||||
mi->bank[1].size = SZ_8M;
|
||||
mi->nr_banks = 2;
|
||||
}
|
||||
|
||||
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
|
||||
/* Maintainer: Jon McClintock */
|
||||
.atag_offset = 0x20100, /* 0xc0000000 - 0xc001ffff can be video RAM */
|
||||
.atag_offset = VIDEORAM_SIZE + 0x100,
|
||||
.fixup = fixup_edb7211,
|
||||
.map_io = edb7211_map_io,
|
||||
.reserve = edb7211_reserve,
|
||||
Loading…
Reference in New Issue