From: Ian Molton <spyro@f2s.com>
This patch drops some more stuff left over from the old combined arm26/32
architecture.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/arm26/kernel/dma.c | 31 -----------
25-akpm/arch/arm26/kernel/ecard.c | 101 ++++++++------------------------------
25-akpm/arch/arm26/kernel/traps.c | 12 ++--
3 files changed, 30 insertions(+), 114 deletions(-)
diff -puN arch/arm26/kernel/dma.c~arm26-remove-arm32-cruft arch/arm26/kernel/dma.c
--- 25/arch/arm26/kernel/dma.c~arm26-remove-arm32-cruft Thu Dec 23 14:21:59 2004
+++ 25-akpm/arch/arm26/kernel/dma.c Thu Dec 23 14:21:59 2004
@@ -1,5 +1,5 @@
/*
- * linux/arch/arm/kernel/dma.c
+ * linux/arch/arm26/kernel/dma.c
*
* Copyright (C) 1995-2000 Russell King
* 2003 Ian Molton
@@ -24,8 +24,6 @@
spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED;
-#if MAX_DMA_CHANNELS > 0
-
static dma_t dma_chan[MAX_DMA_CHANNELS];
/*
@@ -260,33 +258,6 @@ void __init init_dma(void)
arch_dma_init(dma_chan);
}
-#else
-
-int request_dma(dmach_t channel, const char *device_id)
-{
- return -EINVAL;
-}
-
-int get_dma_residue(dmach_t channel)
-{
- return 0;
-}
-
-#define GLOBAL_ALIAS(_a,_b) asm (".set " #_a "," #_b "; .globl " #_a)
-GLOBAL_ALIAS(disable_dma, get_dma_residue);
-GLOBAL_ALIAS(enable_dma, get_dma_residue);
-GLOBAL_ALIAS(free_dma, get_dma_residue);
-GLOBAL_ALIAS(get_dma_list, get_dma_residue);
-GLOBAL_ALIAS(set_dma_mode, get_dma_residue);
-GLOBAL_ALIAS(set_dma_page, get_dma_residue);
-GLOBAL_ALIAS(set_dma_count, get_dma_residue);
-GLOBAL_ALIAS(set_dma_addr, get_dma_residue);
-GLOBAL_ALIAS(set_dma_sg, get_dma_residue);
-GLOBAL_ALIAS(set_dma_speed, get_dma_residue);
-GLOBAL_ALIAS(init_dma, get_dma_residue);
-
-#endif
-
EXPORT_SYMBOL(request_dma);
EXPORT_SYMBOL(free_dma);
EXPORT_SYMBOL(enable_dma);
diff -puN arch/arm26/kernel/ecard.c~arm26-remove-arm32-cruft arch/arm26/kernel/ecard.c
--- 25/arch/arm26/kernel/ecard.c~arm26-remove-arm32-cruft Thu Dec 23 14:21:59 2004
+++ 25-akpm/arch/arm26/kernel/ecard.c Thu Dec 23 14:21:59 2004
@@ -42,9 +42,7 @@
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
-#include <asm/irq.h>
#include <asm/irqchip.h>
#include <asm/tlbflush.h>
@@ -137,65 +135,23 @@ ecard_task_readbytes(struct ecard_reques
unsigned int len = req->length;
unsigned int off = req->address;
- if (req->ec->slot_no == 8) {
- /*
- * The card maintains an index which increments the address
- * into a 4096-byte page on each access. We need to keep
- * track of the counter.
- */
- static unsigned int index;
- unsigned int page;
-
- page = (off >> 12) * 4;
- if (page > 256 * 4)
- return;
-
- off &= 4095;
-
- /*
- * If we are reading offset 0, or our current index is
- * greater than the offset, reset the hardware index counter.
- */
- if (off == 0 || index > off) {
- *base_addr = 0;
- index = 0;
- }
-
- /*
- * Increment the hardware index counter until we get to the
- * required offset. The read bytes are discarded.
- */
- while (index < off) {
- unsigned char byte;
- byte = base_addr[page];
- index += 1;
- }
-
+ if (!req->use_loader || !req->ec->loader) {
+ off *= 4;
while (len--) {
- *buf++ = base_addr[page];
- index += 1;
+ *buf++ = base_addr[off];
+ off += 4;
}
} else {
-
- if (!req->use_loader || !req->ec->loader) {
- off *= 4;
- while (len--) {
- *buf++ = base_addr[off];
- off += 4;
- }
- } else {
- while(len--) {
- /*
- * The following is required by some
- * expansion card loader programs.
- */
- *(unsigned long *)0x108 = 0;
- *buf++ = ecard_loader_read(off++, base_addr,
- req->ec->loader);
- }
+ while(len--) {
+ /*
+ * The following is required by some
+ * expansion card loader programs.
+ */
+ *(unsigned long *)0x108 = 0;
+ *buf++ = ecard_loader_read(off++, base_addr,
+ req->ec->loader);
}
}
-
}
static void ecard_do_request(struct ecard_request *req)
@@ -466,7 +422,7 @@ ecard_irq_handler(unsigned int irq, stru
for (ec = cards; ec; ec = ec->next) {
int pending;
- if (!ec->claimed || ec->irq == NO_IRQ || ec->slot_no == 8)
+ if (!ec->claimed || ec->irq == NO_IRQ)
continue;
if (ec->ops && ec->ops->irqpending)
@@ -494,22 +450,15 @@ unsigned int ecard_address(ecard_t *ec,
unsigned long address = 0;
int slot = ec->slot_no;
- if (ec->slot_no == 8)
- return 0;
-
ectcr &= ~(1 << slot);
switch (type) {
case ECARD_MEMC:
- if (slot < 4)
- address = IO_EC_MEMC_BASE + (slot << 12);
+ address = IO_EC_MEMC_BASE + (slot << 12);
break;
case ECARD_IOC:
- if (slot < 4)
- address = IO_EC_IOC_BASE + (slot << 12);
- if (address)
- address += speed << 17;
+ address = IO_EC_IOC_BASE + (slot << 12) + (speed << 17);
break;
default:
@@ -592,11 +541,9 @@ static void __init ecard_init_resources(
unsigned int slot = ec->slot_no;
int i;
- if (slot < 4) {
- ec_set_resource(ec, ECARD_RES_MEMC,
- PODSLOT_MEMC_BASE + (slot << 14),
- PODSLOT_MEMC_SIZE, IORESOURCE_MEM);
- }
+ ec_set_resource(ec, ECARD_RES_MEMC,
+ PODSLOT_MEMC_BASE + (slot << 14),
+ PODSLOT_MEMC_SIZE, IORESOURCE_MEM);
for (i = 0; i < ECARD_RES_IOCSYNC - ECARD_RES_IOCSLOW; i++) {
ec_set_resource(ec, i + ECARD_RES_IOCSLOW,
@@ -739,12 +686,10 @@ ecard_probe(int slot, card_type_t type)
/*
* hook the interrupt handlers
*/
- if (slot < 8) {
- ec->irq = 32 + slot;
- set_irq_chip(ec->irq, &ecard_chip);
- set_irq_handler(ec->irq, do_level_IRQ);
- set_irq_flags(ec->irq, IRQF_VALID);
- }
+ ec->irq = 32 + slot;
+ set_irq_chip(ec->irq, &ecard_chip);
+ set_irq_handler(ec->irq, do_level_IRQ);
+ set_irq_flags(ec->irq, IRQF_VALID);
for (ecp = &cards; *ecp; ecp = &(*ecp)->next);
@@ -777,7 +722,7 @@ static int __init ecard_init(void)
printk("Probing expansion cards\n");
- for (slot = 0; slot < 4; slot ++) {
+ for (slot = 0; slot < MAX_ECARDS; slot ++) {
ecard_probe(slot, ECARD_IOC);
}
diff -puN arch/arm26/kernel/traps.c~arm26-remove-arm32-cruft arch/arm26/kernel/traps.c
--- 25/arch/arm26/kernel/traps.c~arm26-remove-arm32-cruft Thu Dec 23 14:21:59 2004
+++ 25-akpm/arch/arm26/kernel/traps.c Thu Dec 23 14:21:59 2004
@@ -1,5 +1,5 @@
/*
- * linux/arch/arm/kernel/traps.c
+ * linux/arch/arm26/kernel/traps.c
*
* Copyright (C) 1995-2002 Russell King
* Fragments that appear the same as linux/arch/i386/kernel/traps.c (C) Linus Torvalds
@@ -10,9 +10,11 @@
* published by the Free Software Foundation.
*
* 'traps.c' handles hardware exceptions after we have saved some state in
- * 'linux/arch/arm/lib/traps.S'. Mostly a debugging aid, but will probably
+ * 'linux/arch/arm26/lib/traps.S'. Mostly a debugging aid, but will probably
* kill the offending process.
*/
+
+#include <linux/module.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@ -28,7 +30,6 @@
#include <asm/atomic.h>
#include <asm/io.h>
-#include <asm/pgalloc.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -134,8 +135,6 @@ static void dump_instr(struct pt_regs *r
dump_mem("Stack: ", sp, 8192+(unsigned long)tsk->thread_info);
}
-EXPORT_SYMBOL(dump_stack);
-
void dump_stack(void)
{
#ifdef CONFIG_DEBUG_ERRORS
@@ -143,6 +142,8 @@ void dump_stack(void)
#endif
}
+EXPORT_SYMBOL(dump_stack);
+
//FIXME - was a static fn
void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
{
@@ -425,7 +426,6 @@ asmlinkage int arm_syscall(int no, struc
return 0;
case NR(usr26):
- case NR(usr32):
break;
default:
_