Commit 48ff3e04 authored Sep 28, 2009 by Paul Mundt

sh: Handle ioport_map() cases for >= P1SEG addresses.



This fixes up the case where certain drivers already do their own
remapping and subsequently attempt to use the PIO calls for I/O. In this
case there is no additional remapping that needs to be done, and the
address can be casted in to the cookie directly.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 17d857be

arch/sh/kernel/io_generic.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,9 @@ void generic_outsl(unsigned long port, const void *src, unsigned long count)

		void __iomem *generic_ioport_map(unsigned long addr, unsigned int size)
		{
		if (PXSEG(addr) >= P1SEG)
		return (void __iomem *)addr;

		return (void __iomem *)(addr + generic_io_base);
		}