sh: mach-edosk7705: Fix up edosk7705 so it all builds again. (866ef8f4) · Commits · 戴 / test

arch/sh/boards/mach-edosk7705/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -3,4 +3,3 @@
		#

		obj-y := setup.o io.o

arch/sh/boards/mach-edosk7705/io.c

+19 −42

Original line number	Diff line number	Diff line
		@@ -10,27 +10,23 @@

		#include <linux/kernel.h>
		#include <linux/types.h>
		#include <asm/io.h>
		#include <linux/io.h>
		#include <mach/edosk7705.h>
		#include <asm/addrspace.h>

		#define SMC_IOADDR 0xA2000000

		#define maybebadio(name,port) \
		printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
		#name, (port), (__u32) __builtin_return_address(0))

		/* Map the Ethernet addresses as if it is at 0x300 - 0x320 */
		unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
		static unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
		{
		if (port >= 0x300 && port < 0x320) {
		/* SMC91C96 registers are 4 byte aligned rather than the
		/*
		* SMC91C96 registers are 4 byte aligned rather than the
		* usual 2 byte!
		*/
		if (port >= 0x300 && port < 0x320)
		return SMC_IOADDR + ((port - 0x300) * 2);
		}

		maybebadio(sh_edosk7705_isa_port2addr, port);
		maybebadio(port);
		return port;
		}

		@@ -42,53 +38,34 @@ unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
		*/
		unsigned char sh_edosk7705_inb(unsigned long port)
		{
		if (port >= 0x300 && port < 0x320 && port & 0x01) {
		return (volatile unsigned char)(generic_inw(port -1) >> 8);
		}
		return (volatile unsigned char )sh_edosk7705_isa_port2addr(port);
		}
		if (port >= 0x300 && port < 0x320 && port & 0x01)
		return __raw_readw(port - 1) >> 8;

		unsigned int sh_edosk7705_inl(unsigned long port)
		{
		return (volatile unsigned long )port;
		return __raw_readb(sh_edosk7705_isa_port2addr(port));
		}

		void sh_edosk7705_outb(unsigned char value, unsigned long port)
		{
		if (port >= 0x300 && port < 0x320 && port & 0x01) {
		generic_outw(((unsigned short)value << 8), port -1);
		__raw_writew(((unsigned short)value << 8), port - 1);
		return;
		}
		(volatile unsigned char )sh_edosk7705_isa_port2addr(port) = value;
		}

		void sh_edosk7705_outl(unsigned int value, unsigned long port)
		{
		(volatile unsigned long )port = value;
		__raw_writeb(value, sh_edosk7705_isa_port2addr(port));
		}

		void sh_edosk7705_insb(unsigned long port, void *addr, unsigned long count)
		{
		unsigned char *p = addr;
		while (count--) *p++ = sh_edosk7705_inb(port);
		}

		void sh_edosk7705_insl(unsigned long port, void *addr, unsigned long count)
		{
		unsigned long p = (unsigned long)addr;
		while (count--)
		p++ = (volatile unsigned long *)port;
		*p++ = sh_edosk7705_inb(port);
		}

		void sh_edosk7705_outsb(unsigned long port, const void *addr, unsigned long count)
		{
		unsigned char p = (unsigned char )addr;
		while (count--) sh_edosk7705_outb(*p++, port);
		}

		void sh_edosk7705_outsl(unsigned long port, const void *addr, unsigned long count)
		{
		unsigned long p = (unsigned long)addr;
		while (count--) sh_edosk7705_outl(*p++, port);
		while (count--)
		sh_edosk7705_outb(*p++, port);
		}

arch/sh/boards/mach-edosk7705/setup.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		* board by S. Dunn, 2003.
		*/
		#include <linux/init.h>
		#include <linux/irq.h>
		#include <asm/machvec.h>
		#include <mach/edosk7705.h>

		@@ -26,18 +27,10 @@ static struct sh_machine_vector mv_edosk7705 __initmv = {
		.mv_nr_irqs = 80,

		.mv_inb = sh_edosk7705_inb,
		.mv_inl = sh_edosk7705_inl,
		.mv_outb = sh_edosk7705_outb,
		.mv_outl = sh_edosk7705_outl,

		.mv_inl_p = sh_edosk7705_inl,
		.mv_outl_p = sh_edosk7705_outl,

		.mv_insb = sh_edosk7705_insb,
		.mv_insl = sh_edosk7705_insl,
		.mv_outsb = sh_edosk7705_outsb,
		.mv_outsl = sh_edosk7705_outsl,

		.mv_isa_port2addr = sh_edosk7705_isa_port2addr,
		.mv_init_irq = sh_edosk7705_init_irq,
		};

arch/sh/include/asm/machvec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@
		#include <linux/time.h>
		#include <asm/machtypes.h>

		struct device;

		struct sh_machine_vector {
		void (mv_setup)(char *cmdline_p);
		const char *mv_name;

arch/sh/include/mach-common/mach/edosk7705.h

+4 −27

Original line number	Diff line number	Diff line
		/*
		* include/asm-sh/edosk7705.h
		*
		* Modified version of io_se.h for the EDOSK7705 specific functions.
		*
		* May be copied or modified under the terms of the GNU General Public
		* License. See linux/COPYING for more information.
		*
		* IO functions for an Hitachi EDOSK7705 development board
		*/

		#ifndef __ASM_SH_EDOSK7705_IO_H
		#define __ASM_SH_EDOSK7705_IO_H
		#ifndef __ASM_SH_EDOSK7705_H
		#define __ASM_SH_EDOSK7705_H

		#define __IO_PREFIX sh_edosk7705
		#include <asm/io_generic.h>

		extern unsigned char sh_edosk7705_inb(unsigned long port);
		extern unsigned int sh_edosk7705_inl(unsigned long port);

		extern void sh_edosk7705_outb(unsigned char value, unsigned long port);
		extern void sh_edosk7705_outl(unsigned int value, unsigned long port);

		extern void sh_edosk7705_insb(unsigned long port, void *addr, unsigned long count);
		extern void sh_edosk7705_insl(unsigned long port, void *addr, unsigned long count);
		extern void sh_edosk7705_outsb(unsigned long port, const void *addr, unsigned long count);
		extern void sh_edosk7705_outsl(unsigned long port, const void *addr, unsigned long count);

		extern unsigned long sh_edosk7705_isa_port2addr(unsigned long offset);

		#endif /* __ASM_SH_EDOSK7705_IO_H */
		#endif /* __ASM_SH_EDOSK7705_H */

Admin message