Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2d0373 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: mach-se: Rip out superfluous 7206 PIO routines. 



The PIO trapping was only for MRSHPC and the SMC ethernet. Given that the
SMC ethernet is already properly handled and that nothing is using the
MRSHPC, none of this is needed.

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

arch/sh/boards/mach-se/7206/Makefile

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

# Makefile for the 7206 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/7206/io.c

deleted100644 → 0
+0 −104
Original line number Original line Diff line number Diff line 
/* $Id: io.c,v 1.5 2004/02/22 23:08:43 kkojima Exp $

 *

 * linux/arch/sh/boards/se/7206/io.c

 *

 * Copyright (C) 2006 Yoshinori Sato

 *

 * I/O routine for Hitachi 7206 SolutionEngine.

 *

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <asm/io.h>

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





static inline void delay(void)

{

	__raw_readw(0x20000000);  /* P2 ROM Area */

}



/* 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 >= 0x2000 && port < 0x2020)

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

	else if (port >= 0x300 && port < 0x310)

		return (volatile __u16 *) (PA_SMSC + (port - 0x300));



	return (volatile __u16 *)port;

}



unsigned char se7206_inb(unsigned long port)

{

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

}



unsigned char se7206_inb_p(unsigned long port)

{

	unsigned long v;



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

	delay();

	return v;

}



unsigned short se7206_inw(unsigned long port)

{

	return *port2adr(port);

}



void se7206_outb(unsigned char value, unsigned long port)

{

	*(port2adr(port)) = value;

}



void se7206_outb_p(unsigned char value, unsigned long port)

{

	*(port2adr(port)) = value;

	delay();

}



void se7206_outw(unsigned short value, unsigned long port)

{

	*port2adr(port) = value;

}



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

{

	volatile __u16 *p = port2adr(port);

	__u8 *ap = addr;



	while (count--)

		*ap++ = *p;

}



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

{

	volatile __u16 *p = port2adr(port);

	__u16 *ap = addr;

	while (count--)

		*ap++ = *p;

}



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

{

	volatile __u16 *p = port2adr(port);

	const __u8 *ap = addr;



	while (count--)

		*p = *ap++;

}



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

{

	volatile __u16 *p = port2adr(port);

	const __u16 *ap = addr;

	while (count--)

		*p = *ap++;

}

arch/sh/boards/mach-se/7206/setup.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -86,20 +86,5 @@ __initcall(se7206_devices_setup); 
static struct sh_machine_vector mv_se __initmv = {

static struct sh_machine_vector mv_se __initmv = {

	.mv_name		= "SolutionEngine",

	.mv_name		= "SolutionEngine",

	.mv_nr_irqs		= 256,

	.mv_nr_irqs		= 256,

	.mv_inb			= se7206_inb,

	.mv_inw			= se7206_inw,

	.mv_outb		= se7206_outb,

	.mv_outw		= se7206_outw,



	.mv_inb_p		= se7206_inb_p,

	.mv_inw_p		= se7206_inw,

	.mv_outb_p		= se7206_outb_p,

	.mv_outw_p		= se7206_outw,



	.mv_insb		= se7206_insb,

	.mv_insw		= se7206_insw,

	.mv_outsb		= se7206_outsb,

	.mv_outsw		= se7206_outsw,



	.mv_init_irq		= init_se7206_IRQ,

	.mv_init_irq		= init_se7206_IRQ,

};
 
};