sh: mach-edosk7705: update for this century, kill off PIO trapping. (c1cfed3c) · Commits · 戴 / test

arch/sh/boards/mach-edosk7705/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@
		# Makefile for the EDOSK7705 specific parts of the kernel
		#

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

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

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		/*
		* arch/sh/boards/renesas/edosk7705/io.c
		*
		* Copyright (C) 2001 Ian da Silva, Jeremy Siegel
		* Based largely on io_se.c.
		*
		* I/O routines for Hitachi EDOSK7705 board.
		*
		*/

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

		#define SMC_IOADDR 0xA2000000

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

		maybebadio(port);
		return port;
		}

		/* Trying to read / write bytes on odd-byte boundaries to the Ethernet
		* registers causes problems. So we bit-shift the value and read / write
		* in 2 byte chunks. Setting the low byte to 0 does not cause problems
		* now as odd byte writes are only made on the bit mask / interrupt
		* register. This may not be the case in future Mar-2003 SJD
		*/
		unsigned char sh_edosk7705_inb(unsigned long port)
		{
		if (port >= 0x300 && port < 0x320 && port & 0x01)
		return __raw_readw(port - 1) >> 8;

		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) {
		__raw_writew(((unsigned short)value << 8), port - 1);
		return;
		}

		__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_outsb(unsigned long port, const void *addr, unsigned long count)
		{
		unsigned char p = (unsigned char )addr;

		while (count--)
		sh_edosk7705_outb(*p++, port);
		}

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

+53 −10

Original line number	Diff line number	Diff line
		@@ -10,14 +10,64 @@
		*/
		#include <linux/init.h>
		#include <linux/irq.h>
		#include <asm/machvec.h>
		#include <linux/platform_device.h>
		#include <linux/interrupt.h>
		#include <linux/smc91x.h>
		#include <mach/edosk7705.h>
		#include <asm/machvec.h>
		#include <asm/sizes.h>

		#define SMC_IOBASE 0xA2000000
		#define SMC_IO_OFFSET 0x300
		#define SMC_IOADDR (SMC_IOBASE + SMC_IO_OFFSET)

		#define ETHERNET_IRQ 0x09

		static void __init sh_edosk7705_init_irq(void)
		{
		/* This is the Ethernet interrupt */
		make_imask_irq(0x09);
		make_imask_irq(ETHERNET_IRQ);
		}

		/* eth initialization functions */
		static struct smc91x_platdata smc91x_info = {
		.flags = SMC91X_USE_16BIT \| SMC91X_IO_SHIFT_1 \| IORESOURCE_IRQ_LOWLEVEL,
		};

		static struct resource smc91x_res[] = {
		[0] = {
		.start = SMC_IOADDR,
		.end = SMC_IOADDR + SZ_32 - 1,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = ETHERNET_IRQ,
		.end = ETHERNET_IRQ,
		.flags = IORESOURCE_IRQ ,
		}
		};

		static struct platform_device smc91x_dev = {
		.name = "smc91x",
		.id = -1,
		.num_resources = ARRAY_SIZE(smc91x_res),
		.resource = smc91x_res,

		.dev = {
		.platform_data = &smc91x_info,
		},
		};

		/* platform init code */
		static struct platform_device *edosk7705_devices[] __initdata = {
		&smc91x_dev,
		};

		static int __init init_edosk7705_devices(void)
		{
		return platform_add_devices(edosk7705_devices,
		ARRAY_SIZE(edosk7705_devices));
		}
		__initcall(init_edosk7705_devices);

		/*
		* The Machine Vector
		@@ -25,12 +75,5 @@ static void __init sh_edosk7705_init_irq(void)
		static struct sh_machine_vector mv_edosk7705 __initmv = {
		.mv_name = "EDOSK7705",
		.mv_nr_irqs = 80,

		.mv_inb = sh_edosk7705_inb,
		.mv_outb = sh_edosk7705_outb,

		.mv_insb = sh_edosk7705_insb,
		.mv_outsb = sh_edosk7705_outsb,

		.mv_init_irq = sh_edosk7705_init_irq,
		};

Admin message