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

Commit db0dbae9 authored by Wade Farnsworth's avatar Wade Farnsworth Committed by Paul Mackerras
Browse files

[POWERPC] Add a check for keyboard/mouse device nodes in check_legacy_ioport() 



The device tree for the MPC8641 HPCN does not implement the device type
property for I8042 nodes.

In addition to checking the I8042 node's device type, also match the
keyboard and/or mouse nodes' compatible property.

Signed-off-by: default avatarWade Farnsworth <wfarnsworth@mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6a281856

arch/powerpc/kernel/setup-common.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -486,6 +486,14 @@ int check_legacy_ioport(unsigned long base_port) 




	switch(base_port) {

	switch(base_port) {

	case I8042_DATA_REG:

	case I8042_DATA_REG:

		if (!(np = of_find_compatible_node(NULL, NULL, "pnpPNP,303")))

			np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");

		if (np) {

			parent = of_get_parent(np);

			of_node_put(np);

			np = parent;

			break;

		}

		np = of_find_node_by_type(NULL, "8042");

		np = of_find_node_by_type(NULL, "8042");

		break;

		break;

	case FDC_BASE: /* FDC1 */

	case FDC_BASE: /* FDC1 */