X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fmisc%2Fcros_ec_sandbox.c;h=c4fbca0d3ae129a260d3073fe7387b4f6688ff6b;hb=2cb5d67c1aceb758033954cc06382367ac89e6ac;hp=7509612fb8370d62482636deb86e82b22eb47e56;hpb=0e6b7a28243175ae0874d53b6e6e4eff8548d71f;p=u-boot

diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c
index 7509612fb8..c4fbca0d3a 100644
--- a/drivers/misc/cros_ec_sandbox.c
+++ b/drivers/misc/cros_ec_sandbox.c
@@ -460,6 +460,7 @@ static int process_cmd(struct ec_state *ec,
 		len = cros_ec_keyscan(ec, resp_data);
 		break;
 	case EC_CMD_ENTERING_MODE:
+		len = 0;
 		break;
 	default:
 		printf("   ** Unknown EC command %#02x\n", req_hdr->command);
@@ -516,6 +517,7 @@ int cros_ec_probe(struct udevice *dev)
 	struct ec_state *ec = dev->priv;
 	struct cros_ec_dev *cdev = dev->uclass_priv;
 	const void *blob = gd->fdt_blob;
+	struct udevice *keyb_dev;
 	int node;
 	int err;
 
@@ -524,7 +526,15 @@ int cros_ec_probe(struct udevice *dev)
 	if (err)
 		return err;
 
-	node = fdtdec_next_compatible(blob, 0, COMPAT_GOOGLE_CROS_EC_KEYB);
+	node = -1;
+	for (device_find_first_child(dev, &keyb_dev);
+	     keyb_dev;
+	     device_find_next_child(&keyb_dev)) {
+		if (device_get_uclass_id(keyb_dev) == UCLASS_KEYBOARD) {
+			node = keyb_dev->of_offset;
+			break;
+		}
+	}
 	if (node < 0) {
 		debug("%s: No cros_ec keyboard found\n", __func__);
 	} else if (keyscan_read_fdt_matrix(ec, blob, node)) {