![Linus Torvalds](/assets/img/avatar_default.png)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk 8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45 HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+ /5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9 Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK 4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD NypQthI85pc= =G9mT -----END PGP SIGNATURE----- Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system Pull "Disintegrate and delete asm/system.h" from David Howells: "Here are a bunch of patches to disintegrate asm/system.h into a set of separate bits to relieve the problem of circular inclusion dependencies. I've built all the working defconfigs from all the arches that I can and made sure that they don't break. The reason for these patches is that I recently encountered a circular dependency problem that came about when I produced some patches to optimise get_order() by rewriting it to use ilog2(). This uses bitops - and on the SH arch asm/bitops.h drags in asm-generic/get_order.h by a circuituous route involving asm/system.h. The main difficulty seems to be asm/system.h. It holds a number of low level bits with no/few dependencies that are commonly used (eg. memory barriers) and a number of bits with more dependencies that aren't used in many places (eg. switch_to()). These patches break asm/system.h up into the following core pieces: (1) asm/barrier.h Move memory barriers here. This already done for MIPS and Alpha. (2) asm/switch_to.h Move switch_to() and related stuff here. (3) asm/exec.h Move arch_align_stack() here. Other process execution related bits could perhaps go here from asm/processor.h. (4) asm/cmpxchg.h Move xchg() and cmpxchg() here as they're full word atomic ops and frequently used by atomic_xchg() and atomic_cmpxchg(). (5) asm/bug.h Move die() and related bits. (6) asm/auxvec.h Move AT_VECTOR_SIZE_ARCH here. Other arch headers are created as needed on a per-arch basis." Fixed up some conflicts from other header file cleanups and moving code around that has happened in the meantime, so David's testing is somewhat weakened by that. We'll find out anything that got broken and fix it.. * tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits) Delete all instances of asm/system.h Remove all #inclusions of asm/system.h Add #includes needed to permit the removal of asm/system.h Move all declarations of free_initmem() to linux/mm.h Disintegrate asm/system.h for OpenRISC Split arch_align_stack() out from asm-generic/system.h Split the switch_to() wrapper out of asm-generic/system.h Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h Create asm-generic/barrier.h Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h Disintegrate asm/system.h for Xtensa Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] Disintegrate asm/system.h for Tile Disintegrate asm/system.h for Sparc Disintegrate asm/system.h for SH Disintegrate asm/system.h for Score Disintegrate asm/system.h for S390 Disintegrate asm/system.h for PowerPC Disintegrate asm/system.h for PA-RISC Disintegrate asm/system.h for MN10300 ...
176 lines
4.3 KiB
C
176 lines
4.3 KiB
C
/*
|
|
* Copyright (c) 2000-2001 Vojtech Pavlik
|
|
* Copyright (c) 2002 Russell King
|
|
*/
|
|
|
|
/*
|
|
* Acorn RiscPC PS/2 keyboard controller driver for Linux/ARM
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Should you need to contact me, the author, you can do so either by
|
|
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
|
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/init.h>
|
|
#include <linux/serio.h>
|
|
#include <linux/err.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/hardware/iomd.h>
|
|
|
|
MODULE_AUTHOR("Vojtech Pavlik, Russell King");
|
|
MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:kart");
|
|
|
|
struct rpckbd_data {
|
|
int tx_irq;
|
|
int rx_irq;
|
|
};
|
|
|
|
static int rpckbd_write(struct serio *port, unsigned char val)
|
|
{
|
|
while (!(iomd_readb(IOMD_KCTRL) & (1 << 7)))
|
|
cpu_relax();
|
|
|
|
iomd_writeb(val, IOMD_KARTTX);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static irqreturn_t rpckbd_rx(int irq, void *dev_id)
|
|
{
|
|
struct serio *port = dev_id;
|
|
unsigned int byte;
|
|
int handled = IRQ_NONE;
|
|
|
|
while (iomd_readb(IOMD_KCTRL) & (1 << 5)) {
|
|
byte = iomd_readb(IOMD_KARTRX);
|
|
|
|
serio_interrupt(port, byte, 0);
|
|
handled = IRQ_HANDLED;
|
|
}
|
|
return handled;
|
|
}
|
|
|
|
static irqreturn_t rpckbd_tx(int irq, void *dev_id)
|
|
{
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int rpckbd_open(struct serio *port)
|
|
{
|
|
struct rpckbd_data *rpckbd = port->port_data;
|
|
|
|
/* Reset the keyboard state machine. */
|
|
iomd_writeb(0, IOMD_KCTRL);
|
|
iomd_writeb(8, IOMD_KCTRL);
|
|
iomd_readb(IOMD_KARTRX);
|
|
|
|
if (request_irq(rpckbd->rx_irq, rpckbd_rx, 0, "rpckbd", port) != 0) {
|
|
printk(KERN_ERR "rpckbd.c: Could not allocate keyboard receive IRQ\n");
|
|
return -EBUSY;
|
|
}
|
|
|
|
if (request_irq(rpckbd->tx_irq, rpckbd_tx, 0, "rpckbd", port) != 0) {
|
|
printk(KERN_ERR "rpckbd.c: Could not allocate keyboard transmit IRQ\n");
|
|
free_irq(rpckbd->rx_irq, port);
|
|
return -EBUSY;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void rpckbd_close(struct serio *port)
|
|
{
|
|
struct rpckbd_data *rpckbd = port->port_data;
|
|
|
|
free_irq(rpckbd->rx_irq, port);
|
|
free_irq(rpckbd->tx_irq, port);
|
|
}
|
|
|
|
/*
|
|
* Allocate and initialize serio structure for subsequent registration
|
|
* with serio core.
|
|
*/
|
|
static int __devinit rpckbd_probe(struct platform_device *dev)
|
|
{
|
|
struct rpckbd_data *rpckbd;
|
|
struct serio *serio;
|
|
int tx_irq, rx_irq;
|
|
|
|
rx_irq = platform_get_irq(dev, 0);
|
|
if (rx_irq <= 0)
|
|
return rx_irq < 0 ? rx_irq : -ENXIO;
|
|
|
|
tx_irq = platform_get_irq(dev, 1);
|
|
if (tx_irq <= 0)
|
|
return tx_irq < 0 ? tx_irq : -ENXIO;
|
|
|
|
serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
|
|
rpckbd = kzalloc(sizeof(*rpckbd), GFP_KERNEL);
|
|
if (!serio || !rpckbd) {
|
|
kfree(rpckbd);
|
|
kfree(serio);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
rpckbd->rx_irq = rx_irq;
|
|
rpckbd->tx_irq = tx_irq;
|
|
|
|
serio->id.type = SERIO_8042;
|
|
serio->write = rpckbd_write;
|
|
serio->open = rpckbd_open;
|
|
serio->close = rpckbd_close;
|
|
serio->dev.parent = &dev->dev;
|
|
serio->port_data = rpckbd;
|
|
strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name));
|
|
strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys));
|
|
|
|
platform_set_drvdata(dev, serio);
|
|
serio_register_port(serio);
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit rpckbd_remove(struct platform_device *dev)
|
|
{
|
|
struct serio *serio = platform_get_drvdata(dev);
|
|
struct rpckbd_data *rpckbd = serio->port_data;
|
|
|
|
serio_unregister_port(serio);
|
|
kfree(rpckbd);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver rpckbd_driver = {
|
|
.probe = rpckbd_probe,
|
|
.remove = __devexit_p(rpckbd_remove),
|
|
.driver = {
|
|
.name = "kart",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
module_platform_driver(rpckbd_driver);
|