diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 02:16:42 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 02:16:42 -0400 |
commit | d7cdc9e8ac82c43fdcd4fde6b5b53d2dcba7f707 (patch) | |
tree | 2489b1831a1b5818af0927e4d3c8933bf7d05f31 /arch/sh/kernel | |
parent | 26ff6c11ef38e08990c1e417c299246e6ab18ff7 (diff) |
sh: ioremap() overhaul.
ioremap() overhaul. Add support for transparent PMB mapping, get rid of
p3_ioremap(), etc. Also drop ioremap() and iounmap() routines from the
machvec, as everyone can use the generic ioremap() API instead. For PCI
memory apertures and other special cases, use the pci_iomap() API, as
boards are already required to get the mapping right there.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cf-enabler.c | 5 | ||||
-rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c index f1f9ab87f0b0..c9b823d1d073 100644 --- a/arch/sh/kernel/cf-enabler.c +++ b/arch/sh/kernel/cf-enabler.c | |||
@@ -41,9 +41,6 @@ | |||
41 | #define slot_no 1 | 41 | #define slot_no 1 |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | /* defined in mm/ioremap.c */ | ||
45 | extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags); | ||
46 | |||
47 | /* use this pointer to access to directly connected compact flash io area*/ | 44 | /* use this pointer to access to directly connected compact flash io area*/ |
48 | void *cf_io_base; | 45 | void *cf_io_base; |
49 | 46 | ||
@@ -62,7 +59,7 @@ static int __init allocate_cf_area(void) | |||
62 | return -ENOMEM; | 59 | return -ENOMEM; |
63 | } | 60 | } |
64 | /* printk("p3_ioremap(paddr=0x%08lx, psize=0x%08lx, prot=0x%08lx)=0x%08lx\n", | 61 | /* printk("p3_ioremap(paddr=0x%08lx, psize=0x%08lx, prot=0x%08lx)=0x%08lx\n", |
65 | paddrbase, psize, prot.pgprot, cf_io_base);*/ | 62 | paddrbase, psize, prot.pgprot, cf_io_base);*/ |
66 | 63 | ||
67 | /* XXX : do we need attribute and common-memory area also? */ | 64 | /* XXX : do we need attribute and common-memory area also? */ |
68 | 65 | ||
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index 8a6dd06fd071..b73feafcd06e 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
@@ -27,7 +27,6 @@ EXPORT_SYMBOL(sh_mv); | |||
27 | 27 | ||
28 | /* platform dependent support */ | 28 | /* platform dependent support */ |
29 | EXPORT_SYMBOL(dump_fpu); | 29 | EXPORT_SYMBOL(dump_fpu); |
30 | EXPORT_SYMBOL(iounmap); | ||
31 | EXPORT_SYMBOL(enable_irq); | 30 | EXPORT_SYMBOL(enable_irq); |
32 | EXPORT_SYMBOL(disable_irq); | 31 | EXPORT_SYMBOL(disable_irq); |
33 | EXPORT_SYMBOL(probe_irq_mask); | 32 | EXPORT_SYMBOL(probe_irq_mask); |