[ARM] Remove old Acorn iomd-based keyboard and mouse drivers.

Vojtech has patches that bring their counterparts in the input
subsystem up to date (and into a working state) so these drivers
are no longer required.

This cset also fixes the Acorn i2c RTC code.

drivers/acorn/char/Makefile

@@ -3,16 +3,11 @@
 #
 
 # All the objects that export symbols.
-obj-arc		:= keyb_arc.o
-obj-rpc		:= keyb_ps2.o
-obj-clps7500	:= keyb_ps2.o defkeymap-acorn.o
+obj-arc		:= keyb_arc.o defkeymap-acorn.o
 
-obj-$(CONFIG_RPCMOUSE)		+= mouse_rpc.o
-obj-$(CONFIG_ARCH_ACORN)	+= defkeymap-acorn.o i2c.o pcf8583.o
+obj-$(CONFIG_ARCH_ACORN)	+= i2c.o pcf8583.o
 obj-$(CONFIG_L7200_KEYB)	+= defkeymap-l7200.o keyb_l7200.o
-
-# Do the i2c and rtc last
-obj-y		+= $(obj-$(MACHINE))
+obj-y				+= $(obj-$(MACHINE))
 
 include $(TOPDIR)/Rules.make
 

drivers/acorn/char/i2c.c

@@ -132,7 +132,7 @@ static int k_set_rtc_time(void)
 	if (rtc_command(RTC_GETDATETIME, &old_rtctm))
 		return 0;
 
-	new_rtctm.cs    = xtime.tv_usec / 10000;
+	new_rtctm.cs    = xtime.tv_nsec / 10000000;
 	new_rtctm.secs  = nowtime % 60;	nowtime /= 60;
 	new_rtctm.mins  = nowtime % 60;	nowtime /= 60;
 	new_rtctm.hours = nowtime % 24;
@@ -283,7 +283,7 @@ static int ioc_client_reg(struct i2c_client *client)
 		rtc_client = client;
 		get_rtc_time(&rtctm, &year);
 
-		xtime.tv_usec = rtctm.cs * 10000;
+		xtime.tv_nsec = rtctm.cs * 10000000;
 		xtime.tv_sec  = mktime(year, rtctm.mon, rtctm.mday,
 				       rtctm.hours, rtctm.mins, rtctm.secs);
 		set_rtc = k_set_rtc_time;

drivers/acorn/char/mouse_rpc.c

-/*
- *  linux/drivers/char/mouse_rpc.c
- *
- *  Copyright (C) 1996-1998 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  This handles the Acorn RiscPCs mouse.  We basically have a couple
- *  of hardware registers that track the sensor count for the X-Y movement
- *  and another register holding the button state.  On every VSYNC interrupt
- *  we read the complete state and then work out if something has changed.
- */
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/ptrace.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/hardware/iomd.h>
-
-#include "../../char/busmouse.h"
-
-static short old_x, old_y, old_b;
-static int mousedev;
-
-void
-mouse_rpc_irq(int irq, void *dev_id, struct pt_regs *regs)
-{
-	short x, y, dx, dy;
-	int buttons;
-
-	x = (short)iomd_readl(IOMD_MOUSEX);
-	y = (short)iomd_readl(IOMD_MOUSEY);
-	buttons = (__raw_readl(0xe0310000) >> 4) & 7;
-
-	dx = x - old_x;
-	old_x = x;
-	dy = y - old_y;
-	old_y = y;
-
-	if (dx || dy || buttons != old_b) {
-		busmouse_add_movementbuttons(mousedev, dx, dy, buttons);
-		old_b = buttons;
-	}
-}
-
-static struct busmouse rpcmouse = {
-	6, "arcmouse", NULL, NULL, NULL, 7
-};
-
-static int __init mouse_rpc_init(void)
-{
-	mousedev = register_busmouse(&rpcmouse);
-
-	if (mousedev < 0)
-		printk("rpcmouse: could not register mouse driver\n");
-	else {
-		old_x = (short)iomd_readl(IOMD_MOUSEX);
-		old_y = (short)iomd_readl(IOMD_MOUSEY);
-		old_b = (__raw_readl(0xe0310000) >> 4) & 7;
-		if (request_irq(IRQ_VSYNCPULSE, mouse_rpc_irq, SA_SHIRQ, "mouse", &mousedev)) {
-			printk("rpcmouse: unable to allocate VSYNC interrupt\n");
-			unregister_busmouse(mousedev);
-			mousedev = -1;
-		}
-	}
-
-	return mousedev >= 0 ? 0 : -ENODEV;
-}
-
-static void __exit mouse_rpc_exit(void)
-{
-	if (mousedev >= 0) {
-		unregister_busmouse(mousedev);
-		free_irq(IRQ_VSYNCPULSE, &mousedev);
-	}
-}
-
-module_init(mouse_rpc_init);
-module_exit(mouse_rpc_exit);
-
-MODULE_AUTHOR("Russell King");
-MODULE_DESCRIPTION("RiscPC mouse driver");
-MODULE_LICENSE("GPL");
-