Commit 1e789887 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: mach-se: Rip out superfluous 770x PIO routines. 



Platform data takes care of all of these these days, kill them off.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c819cc73

arch/sh/boards/mach-se/770x/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Makefile for the 770x SolutionEngine specific parts of the kernel

#



obj-y	 := setup.o io.o irq.o
 
obj-y	 := setup.o irq.o

arch/sh/boards/mach-se/770x/io.c

deleted100644 → 0
+0 −156
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2000  Kazumoto Kojima

 *

 * I/O routine for Hitachi SolutionEngine.

 */

#include <linux/kernel.h>

#include <linux/types.h>

#include <asm/io.h>

#include <mach-se/mach/se.h>



/* MS7750 requires special versions of in*, out* routines, since

   PC-like io ports are located at upper half byte of 16-bit word which

   can be accessed only with 16-bit wide.  */



static inline volatile __u16 *

port2adr(unsigned int port)

{

	if (port & 0xff000000)

		return ( volatile __u16 *) port;

	if (port >= 0x2000)

		return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));

	else if (port >= 0x1000)

		return (volatile __u16 *) (PA_83902 + (port << 1));

	else

		return (volatile __u16 *) (PA_SUPERIO + (port << 1));

}



static inline int

shifted_port(unsigned long port)

{

	/* For IDE registers, value is not shifted */

	if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)

		return 0;

	else

		return 1;

}



unsigned char se_inb(unsigned long port)

{

	if (shifted_port(port))

		return (*port2adr(port) >> 8);

	else

		return (*port2adr(port))&0xff;

}



unsigned char se_inb_p(unsigned long port)

{

	unsigned long v;



	if (shifted_port(port))

		v = (*port2adr(port) >> 8);

	else

		v = (*port2adr(port))&0xff;

	ctrl_delay();

	return v;

}



unsigned short se_inw(unsigned long port)

{

	if (port >= 0x2000)

		return *port2adr(port);

	else

		maybebadio(port);

	return 0;

}



unsigned int se_inl(unsigned long port)

{

	maybebadio(port);

	return 0;

}



void se_outb(unsigned char value, unsigned long port)

{

	if (shifted_port(port))

		*(port2adr(port)) = value << 8;

	else

		*(port2adr(port)) = value;

}



void se_outb_p(unsigned char value, unsigned long port)

{

	if (shifted_port(port))

		*(port2adr(port)) = value << 8;

	else

		*(port2adr(port)) = value;

	ctrl_delay();

}



void se_outw(unsigned short value, unsigned long port)

{

	if (port >= 0x2000)

		*port2adr(port) = value;

	else

		maybebadio(port);

}



void se_outl(unsigned int value, unsigned long port)

{

	maybebadio(port);

}



void se_insb(unsigned long port, void *addr, unsigned long count)

{

	volatile __u16 *p = port2adr(port);

	__u8 *ap = addr;



	if (shifted_port(port)) {

		while (count--)

			*ap++ = *p >> 8;

	} else {

		while (count--)

			*ap++ = *p;

	}

}



void se_insw(unsigned long port, void *addr, unsigned long count)

{

	volatile __u16 *p = port2adr(port);

	__u16 *ap = addr;

	while (count--)

		*ap++ = *p;

}



void se_insl(unsigned long port, void *addr, unsigned long count)

{

	maybebadio(port);

}



void se_outsb(unsigned long port, const void *addr, unsigned long count)

{

	volatile __u16 *p = port2adr(port);

	const __u8 *ap = addr;



	if (shifted_port(port)) {

		while (count--)

			*p = *ap++ << 8;

	} else {

		while (count--)

			*p = *ap++;

	}

}



void se_outsw(unsigned long port, const void *addr, unsigned long count)

{

	volatile __u16 *p = port2adr(port);

	const __u16 *ap = addr;



	while (count--)

		*p = *ap++;

}



void se_outsl(unsigned long port, const void *addr, unsigned long count)

{

	maybebadio(port);

}

arch/sh/boards/mach-se/770x/setup.c

+0 −22
Original line number Diff line number Diff line
@@ -195,27 +195,5 @@ static struct sh_machine_vector mv_se __initmv = { 
#elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)

	.mv_nr_irqs             = 104,

#endif



	.mv_inb			= se_inb,

	.mv_inw			= se_inw,

	.mv_inl			= se_inl,

	.mv_outb		= se_outb,

	.mv_outw		= se_outw,

	.mv_outl		= se_outl,



	.mv_inb_p		= se_inb_p,

	.mv_inw_p		= se_inw,

	.mv_inl_p		= se_inl,

	.mv_outb_p		= se_outb_p,

	.mv_outw_p		= se_outw,

	.mv_outl_p		= se_outl,



	.mv_insb		= se_insb,

	.mv_insw		= se_insw,

	.mv_insl		= se_insl,

	.mv_outsb		= se_outsb,

	.mv_outsw		= se_outsw,

	.mv_outsl		= se_outsl,



	.mv_init_irq		= init_se_IRQ,

};