Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 540c6c39 authored by Martyn Welch's avatar Martyn Welch Committed by Benjamin Herrenschmidt
Browse files

powerpc: Add i8042 keyboard and mouse irq parsing 



Currently the irqs for the i8042, which historically provides keyboard and
mouse (aux) support, is hardwired in the driver rather than parsing the
dts.  This patch modifies the powerpc legacy IO code to attempt to parse
the device tree for this information, failing back to the hardcoded values
if it fails.

Signed-off-by: default avatarMartyn Welch <martyn.welch@ge.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 68581e93

arch/powerpc/kernel/setup-common.c

+13 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ struct screen_info screen_info = { 
	.orig_video_points = 16

};



/* Variables required to store legacy IO irq routing */

int of_i8042_kbd_irq;

int of_i8042_aux_irq;



#ifdef __DO_IRQ_CANON

/* XXX should go elsewhere eventually */

int ppc_do_canonicalize_irqs;
@@ -575,6 +579,15 @@ int check_legacy_ioport(unsigned long base_port) 
			np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");

		if (np) {

			parent = of_get_parent(np);



			of_i8042_kbd_irq = irq_of_parse_and_map(parent, 0);

			if (!of_i8042_kbd_irq)

				of_i8042_kbd_irq = 1;



			of_i8042_aux_irq = irq_of_parse_and_map(parent, 1);

			if (!of_i8042_aux_irq)

				of_i8042_aux_irq = 12;



			of_node_put(np);

			np = parent;

			break;

drivers/input/serio/i8042-io.h

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
#include <asm/irq.h>

#elif defined(CONFIG_SH_CAYMAN)

#include <asm/irq.h>

#elif defined(CONFIG_PPC)

extern int of_i8042_kbd_irq;

extern int of_i8042_aux_irq;

# define I8042_KBD_IRQ  of_i8042_kbd_irq

# define I8042_AUX_IRQ  of_i8042_aux_irq

#else

# define I8042_KBD_IRQ	1

# define I8042_AUX_IRQ	12