mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Merge branch 'fb' into devel
Conflicts: arch/arm/Kconfig
This commit is contained in:
commit
946e2ad040
10 changed files with 3 additions and 124 deletions
|
@ -232,13 +232,6 @@ config ARCH_CLPS711X
|
|||
help
|
||||
Support for Cirrus Logic 711x/721x based boards.
|
||||
|
||||
config ARCH_CO285
|
||||
bool "Co-EBSA285"
|
||||
select FOOTBRIDGE
|
||||
select FOOTBRIDGE_ADDIN
|
||||
help
|
||||
Support for Intel's EBSA285 companion chip.
|
||||
|
||||
config ARCH_EBSA110
|
||||
bool "EBSA-110"
|
||||
select ISA
|
||||
|
@ -789,7 +782,7 @@ source "mm/Kconfig"
|
|||
|
||||
config LEDS
|
||||
bool "Timer and CPU usage LEDs"
|
||||
depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
|
||||
depends on ARCH_CDB89712 || ARCH_EBSA110 || \
|
||||
ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
|
||||
ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
|
||||
ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
|
||||
|
|
|
@ -100,8 +100,6 @@ textofs-y := 0x00008000
|
|||
incdir-$(CONFIG_ARCH_CLPS7500) := cl7500
|
||||
machine-$(CONFIG_FOOTBRIDGE) := footbridge
|
||||
incdir-$(CONFIG_FOOTBRIDGE) := ebsa285
|
||||
machine-$(CONFIG_ARCH_CO285) := footbridge
|
||||
incdir-$(CONFIG_ARCH_CO285) := ebsa285
|
||||
machine-$(CONFIG_ARCH_SHARK) := shark
|
||||
machine-$(CONFIG_ARCH_SA1100) := sa1100
|
||||
ifeq ($(CONFIG_ARCH_SA1100),y)
|
||||
|
|
|
@ -14,12 +14,10 @@ pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o
|
|||
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o
|
||||
pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o
|
||||
|
||||
leds-$(CONFIG_ARCH_CO285) += ebsa285-leds.o
|
||||
leds-$(CONFIG_ARCH_EBSA285) += ebsa285-leds.o
|
||||
leds-$(CONFIG_ARCH_NETWINDER) += netwinder-leds.o
|
||||
|
||||
obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o
|
||||
obj-$(CONFIG_ARCH_CO285) += co285.o dc21285-timer.o
|
||||
obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o
|
||||
obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o
|
||||
obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
/*
|
||||
* linux/arch/arm/mach-footbridge/co285.c
|
||||
*
|
||||
* CO285 machine fixup
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <asm/hardware/dec21285.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
static void __init
|
||||
fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
|
||||
char **cmdline, struct meminfo *mi)
|
||||
{
|
||||
extern unsigned long boot_memory_end;
|
||||
extern char boot_command_line[];
|
||||
|
||||
mi->nr_banks = 1;
|
||||
mi->bank[0].start = PHYS_OFFSET;
|
||||
mi->bank[0].size = boot_memory_end;
|
||||
mi->bank[0].node = 0;
|
||||
|
||||
*cmdline = boot_command_line;
|
||||
}
|
||||
|
||||
MACHINE_START(CO285, "co-EBSA285")
|
||||
/* Maintainer: Mark van Doesburg */
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc,
|
||||
.fixup = fixup_coebsa285,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &footbridge_timer,
|
||||
MACHINE_END
|
||||
|
|
@ -177,25 +177,6 @@ static struct map_desc ebsa285_host_io_desc[] __initdata = {
|
|||
#endif
|
||||
};
|
||||
|
||||
/*
|
||||
* The CO-ebsa285 mapping.
|
||||
*/
|
||||
static struct map_desc co285_io_desc[] __initdata = {
|
||||
#ifdef CONFIG_ARCH_CO285
|
||||
{
|
||||
.virtual = PCIO_BASE,
|
||||
.pfn = __phys_to_pfn(DC21285_PCI_IO),
|
||||
.length = PCIO_SIZE,
|
||||
.type = MT_DEVICE,
|
||||
}, {
|
||||
.virtual = PCIMEM_BASE,
|
||||
.pfn = __phys_to_pfn(DC21285_PCI_MEM),
|
||||
.length = PCIMEM_SIZE,
|
||||
.type = MT_DEVICE,
|
||||
},
|
||||
#endif
|
||||
};
|
||||
|
||||
void __init footbridge_map_io(void)
|
||||
{
|
||||
/*
|
||||
|
@ -208,8 +189,6 @@ void __init footbridge_map_io(void)
|
|||
* Now, work out what we've got to map in addition on this
|
||||
* platform.
|
||||
*/
|
||||
if (machine_is_co285())
|
||||
iotable_init(co285_io_desc, ARRAY_SIZE(co285_io_desc));
|
||||
if (footbridge_cfn_mode())
|
||||
iotable_init(ebsa285_host_io_desc, ARRAY_SIZE(ebsa285_host_io_desc));
|
||||
}
|
||||
|
|
|
@ -128,7 +128,7 @@ static void ebsa285_leds_event(led_event_t evt)
|
|||
|
||||
static int __init leds_init(void)
|
||||
{
|
||||
if (machine_is_ebsa285() || machine_is_co285())
|
||||
if (machine_is_ebsa285())
|
||||
leds_event = ebsa285_leds_event;
|
||||
|
||||
leds_event(led_start);
|
||||
|
|
|
@ -115,8 +115,7 @@ static int set_isa_cmos_time(void)
|
|||
|
||||
void __init isa_rtc_init(void)
|
||||
{
|
||||
if (machine_is_co285() ||
|
||||
machine_is_personal_server())
|
||||
if (machine_is_personal_server())
|
||||
/*
|
||||
* Add-in 21285s shouldn't access the RTC
|
||||
*/
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
#include <asm/arch/memory.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_FOOTBRIDGE
|
||||
/* Virtual Physical Size
|
||||
* 0xff800000 0x40000000 1MB X-Bus
|
||||
* 0xff000000 0x7c000000 1MB PCI I/O space
|
||||
|
@ -50,31 +49,6 @@
|
|||
#define PCIMEM_SIZE 0x01000000
|
||||
#define PCIMEM_BASE 0xf0000000
|
||||
|
||||
#elif defined(CONFIG_ARCH_CO285)
|
||||
/*
|
||||
* This is the COEBSA285 cut-down mapping
|
||||
*/
|
||||
#define PCIMEM_SIZE 0x80000000
|
||||
#define PCIMEM_BASE 0x80000000
|
||||
|
||||
#define WFLUSH_SIZE 0x01000000
|
||||
#define WFLUSH_BASE 0x7d000000
|
||||
|
||||
#define ARMCSR_SIZE 0x00100000
|
||||
#define ARMCSR_BASE 0x7cf00000
|
||||
|
||||
#define XBUS_SIZE 0x00020000
|
||||
#define XBUS_BASE 0x7cee0000
|
||||
|
||||
#define PCIO_SIZE 0x00010000
|
||||
#define PCIO_BASE 0x7ced0000
|
||||
|
||||
#else
|
||||
|
||||
#error "Undefined footbridge architecture"
|
||||
|
||||
#endif
|
||||
|
||||
#define XBUS_LEDS ((volatile unsigned char *)(XBUS_BASE + 0x12000))
|
||||
#define XBUS_LED_AMBER (1 << 0)
|
||||
#define XBUS_LED_GREEN (1 << 1)
|
||||
|
|
|
@ -42,8 +42,6 @@ extern unsigned long __bus_to_virt(unsigned long);
|
|||
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ARCH_FOOTBRIDGE)
|
||||
|
||||
/* Task size and page offset at 3GB */
|
||||
#define TASK_SIZE UL(0xbf000000)
|
||||
#define PAGE_OFFSET UL(0xc0000000)
|
||||
|
@ -53,23 +51,6 @@ extern unsigned long __bus_to_virt(unsigned long);
|
|||
*/
|
||||
#define FLUSH_BASE 0xf9000000
|
||||
|
||||
#elif defined(CONFIG_ARCH_CO285)
|
||||
|
||||
/* Task size and page offset at 1.5GB */
|
||||
#define TASK_SIZE UL(0x5f000000)
|
||||
#define PAGE_OFFSET UL(0x60000000)
|
||||
|
||||
/*
|
||||
* Cache flushing area.
|
||||
*/
|
||||
#define FLUSH_BASE 0x7e000000
|
||||
|
||||
#else
|
||||
|
||||
#error "Undefined footbridge architecture"
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Physical DRAM offset.
|
||||
*/
|
||||
|
|
|
@ -7,8 +7,4 @@
|
|||
*/
|
||||
|
||||
|
||||
#ifdef CONFIG_ARCH_FOOTBRIDGE
|
||||
#define VMALLOC_END (PAGE_OFFSET + 0x30000000)
|
||||
#else
|
||||
#define VMALLOC_END (PAGE_OFFSET + 0x20000000)
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue