Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision 3e53ab7b0eacdf72743712841abf0bf6d897b956)
+++ kernel/arch/sparc64/Makefile.inc	(revision 790536061cb4371c57e65bff5bb724167a141f7b)
@@ -107,5 +107,6 @@
 	arch/$(ARCH)/src/drivers/kbd.c \
 	arch/$(ARCH)/src/drivers/scr.c \
-	arch/$(ARCH)/src/drivers/pci.c
+	arch/$(ARCH)/src/drivers/pci.c \
+	arch/$(ARCH)/src/drivers/psycho.c
 
 ifeq ($(CONFIG_SMP),y)
Index: kernel/arch/sparc64/include/drivers/psycho.h
===================================================================
--- kernel/arch/sparc64/include/drivers/psycho.h	(revision 790536061cb4371c57e65bff5bb724167a141f7b)
+++ kernel/arch/sparc64/include/drivers/psycho.h	(revision 790536061cb4371c57e65bff5bb724167a141f7b)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2008 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup sparc64	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef KERN_sparc64_PSYCHO_H_
+#define KERN_sparc64_PSYCHO_H_
+
+#include <arch/types.h>
+#include <genarch/ofw/ofw_tree.h>
+
+typedef struct {
+	volatile uint64_t *regs;
+} psycho_t;
+
+extern psycho_t *psycho_a;
+extern psycho_t *psycho_b;
+
+extern psycho_t *psycho_init(ofw_tree_node_t *node);
+extern void psycho_enable_interrupt(psycho_t *psycho, int inr);
+extern void psycho_clear_interrupt(psycho_t *psycho, int inr);
+
+#endif
+
+/** @}
+ */
Index: kernel/arch/sparc64/src/drivers/psycho.c
===================================================================
--- kernel/arch/sparc64/src/drivers/psycho.c	(revision 790536061cb4371c57e65bff5bb724167a141f7b)
+++ kernel/arch/sparc64/src/drivers/psycho.c	(revision 790536061cb4371c57e65bff5bb724167a141f7b)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2008 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup sparc64
+ * @{
+ */
+/**
+ * @file
+ * @brief	Driver for the UPA to PCI bridge (Psycho).
+ */
+
+#include <arch/drivers/psycho.h>
+#include <arch/trap/interrupt.h>
+#include <mm/page.h>
+#include <mm/slab.h>
+#include <arch/types.h>
+#include <genarch/ofw/ofw_tree.h>
+
+#define PSYCHO_IGN		0x7c0
+#define PSYCHO_KEYBOARD_INR	0x29
+
+psycho_t *psycho_a = NULL;
+psycho_t *psycho_b = NULL;
+
+psycho_t *psycho_init(ofw_tree_node_t *node)
+{
+	psycho_t *psycho;
+	ofw_tree_property_t *prop;
+
+	prop = ofw_tree_getprop(node, "reg");
+	
+	if (!prop || !prop->value)
+		return NULL;
+		
+	ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[0]; /* XXX */
+
+	uintptr_t paddr;
+	if (!ofw_upa_apply_ranges(node->parent, reg, &paddr))
+		return NULL;
+
+	psycho = (psycho_t *) malloc(sizeof(psycho_t), FRAME_ATOMIC);
+	if (!psycho)
+		return NULL;
+
+	psycho->regs = (uint64_t *) hw_map(paddr, reg->size);
+	
+	return psycho;
+}
+
+void psycho_enable_interrupt(psycho_t *psycho, int inr)
+{
+	inr -= PSYCHO_IGN;
+	switch (inr) {
+	case PSYCHO_KEYBOARD_INR:
+		psycho->regs[0] = 1;	/* XXX */
+		break;
+	default:
+		panic("Unexpected INR (%d)\n", inr);
+		break;
+	}
+}
+
+void psycho_clear_interrupt(psycho_t *psycho, int inr)
+{
+	inr -= PSYCHO_IGN;
+	switch (inr) {
+	case PSYCHO_KEYBOARD_INR:
+		psycho->regs[0] = 0;	/* XXX */
+		break;
+	default:
+		panic("Unexpected INR (%d)\n", inr);
+		break;
+	}
+}
+
+/** @}
+ */