diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-25 15:06:13 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 11:31:42 +0400 |
| commit | 86e4dd5add77ab809f5427391dfabb8f78cbcb58 (patch) | |
| tree | 43d2c40951df78d5404a72da214f8c8a788d3de3 /arch/sh/include/asm/machvec.h | |
| parent | 1c98347e613bf17ea2f18c9766ce0ab77f65a96d (diff) | |
| download | linux-86e4dd5add77ab809f5427391dfabb8f78cbcb58.tar.xz | |
sh: support for platforms without PIO.
This extends some of the existing special casing for HAS_IOPORT
platforms and gets it to the point where platforms can begin to
conditionally select it.
The major changes here are that the PIO routines themselves go away
completely, including all of the machvec port mapping wrappers. With this
in place it's possible for any non-machvec abusing platform to disable
PIO completely. At present this is left as an opt-in until the abusers
are the odd ones out instead of the majority.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/machvec.h')
| -rw-r--r-- | arch/sh/include/asm/machvec.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index bc0218cb72e1..a0b0cf79cf8a 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h @@ -19,6 +19,10 @@ struct sh_machine_vector { const char *mv_name; int mv_nr_irqs; + int (*mv_irq_demux)(int irq); + void (*mv_init_irq)(void); + +#ifdef CONFIG_HAS_IOPORT u8 (*mv_inb)(unsigned long); u16 (*mv_inw)(unsigned long); u32 (*mv_inl)(unsigned long); @@ -40,12 +44,9 @@ struct sh_machine_vector { void (*mv_outsw)(unsigned long, const void *src, unsigned long count); void (*mv_outsl)(unsigned long, const void *src, unsigned long count); - int (*mv_irq_demux)(int irq); - - void (*mv_init_irq)(void); - void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); void (*mv_ioport_unmap)(void __iomem *); +#endif int (*mv_clk_init)(void); int (*mv_mode_pins)(void); |