From nobody Sun Jun 14 17:20:45 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D0BD374E4C for ; Fri, 3 Apr 2026 22:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775254994; cv=none; b=YG9nDvIkyVJSjTZyMBVI39TLcesn4LxVK0aIPC8TTeQA+xFB/Q08E8fWa5g5M8EhRmsHbjye2isT97bjBTXcTdzY6nuKGPabpneEwuXCWjDagdtWOgh3rxKLpfY0OOu58qmoKjXWt5Z5qO3aL9FBY+3sxIyS77DdEF43AAT6EAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775254994; c=relaxed/simple; bh=tUs03xfRhr0/4Kj+RLDdjg2OwVNhqIqNUqoEiMApBBE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZsIVzCnDvOPUQHR9H/EcPTXrqMY56+qV1w8gWeZlO886ijhO6bBLwu9JODAivYbUPyo3JbZWhz2LNw6U1Mgn8mhgMC9BbbaW5ZBikDTZGvaZlhMvvT+YDehPNsljdzkywzwWCGNhzduPdeBeFBngvco5UYl2T+HsnR3nYIKyfmE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HFSlQUXJ; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthies.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HFSlQUXJ" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c68a134df8so2199289eec.1 for ; Fri, 03 Apr 2026 15:23:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775254989; x=1775859789; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Z5x6Pgh8rN/XyVYOuWDISX9Lht73hIQJmSqNkuOIMnE=; b=HFSlQUXJfBQVGSnhKS/vbdCD9BPSiYf8V8vBeXto7gk8qCJ8oElUe12JnaO6tFhG8+ RfCfTJ4oxYJ9cNGlC5bAI7oU44wEAdrJ2T7X33CYklBJb4/MVmuxf1ijJPYFtYU5KPo2 PpnQTh3nOf+kmFrX+JO7b0RtCUmggcBr+dkCWt8i0j2wckOc9o/EGVBKPLxTkBxr7o33 fJ032/oJkQZvDgPgMjFZNTq456PJTDAPGEIYT9+chbxR3puba4a+oH3eGuObrYLnRHtO eSY0F7en6YIJl0/R8wVi1/lvRCkDfkC/+BwRLo+/mcTOQsYxptriY5Y2N1AqZKMtgfRG MWwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775254989; x=1775859789; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z5x6Pgh8rN/XyVYOuWDISX9Lht73hIQJmSqNkuOIMnE=; b=ZqtRL9lYhZIjnbK7dqFaAGmdqJLaxK1bGr5yy6MpSzyZIkDs+1FG/19V33y/qv6D0G UmHEsNlOm8TQPvNJUhmQmj+si9bQ+7nc0CUSotVrbBmJC/XaS6g6XZEajCaDp0zwBerR AKfJ+qT4bP+RjmodtCqtMToMJN8vPE0LikcoSJqzHXFNNx6j2PFnnZ/uZKpTeO1H+uKa ky5m9G4NTN+JmYjjIqIXA+OF1YtjGFlhQqMQehMM4DA8TKZ5INeaa7R+bBzCI8vHtaVx 4S97Yjdt6UNnMwuqrJX56megdxI/PFHiWPC0LdkMavWQkrZ05OvpJd6v/nT28mHFex3d fHLA== X-Forwarded-Encrypted: i=1; AJvYcCVwwNPZwki2+tg0k7TAKmJXtO2B4Jlo+CFAARm1sHgZb59gaPDn4LthP8qx8yxJG87eK2MU6DVPysgqfeg=@vger.kernel.org X-Gm-Message-State: AOJu0YynmKgXSPUebJ9brEYMqHgNom+RfRuwVrf3jcLRAdQKTNM0nbeW WOBVPtaK3aMpzIzB6a/zrwZQOJdJBWr2RLRtCkQRC3JYPDpXm7PFe8UwJatZ+/N+1LcKODfx/cg Q7XUmOg== X-Received: from dycmz18.prod.google.com ([2002:a05:7300:ea12:b0:2c0:be02:79e8]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:fb91:b0:2cb:7663:322a with SMTP id 5a478bee46e88-2cbf9fe7dfamr2381762eec.13.1775254988749; Fri, 03 Apr 2026 15:23:08 -0700 (PDT) Date: Fri, 3 Apr 2026 22:22:53 +0000 In-Reply-To: <20260403222253.1888991-1-jthies@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260403222253.1888991-1-jthies@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260403222253.1888991-2-jthies@google.com> Subject: [PATCH v1 1/1] mfd: cros_ec: Don't add cros_ec_ucsi if it is defined in OF or ACPI From: Jameson Thies To: lee@kernel.org, bleung@chromium.org, tzungbi@kernel.org Cc: chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, abhishekpandit@chromium.org, akuchynski@chromium.org, ukaszb@chromium.org, Jameson Thies Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On devices with a UCSI PPM in the EC, check for cros_ec_ucsi to be defined in the OF device tree or an ACPI node. If it is defined by either OF or ACPI, it does not need to be added as a subdevice of cros_ec_dev mfd. cros_ec_ucsi will load from the OF or ACPI node. Signed-off-by: Jameson Thies Reviewed-by: Benson Leung --- drivers/mfd/cros_ec_dev.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 39430dd44e30..70d64b7c6243 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -5,6 +5,7 @@ * Copyright (C) 2014 Google, Inc. */ =20 +#include #include #include #include @@ -131,11 +132,6 @@ static const struct cros_feature_to_cells cros_subdevi= ces[] =3D { .mfd_cells =3D cros_ec_rtc_cells, .num_cells =3D ARRAY_SIZE(cros_ec_rtc_cells), }, - { - .id =3D EC_FEATURE_UCSI_PPM, - .mfd_cells =3D cros_ec_ucsi_cells, - .num_cells =3D ARRAY_SIZE(cros_ec_ucsi_cells), - }, { .id =3D EC_FEATURE_HANG_DETECT, .mfd_cells =3D cros_ec_wdt_cells, @@ -264,6 +260,23 @@ static int ec_device_probe(struct platform_device *pde= v) } } =20 + /* + * FW nodes can load cros_ec_ucsi, but early PDC devices did not define + * the required nodes. On PDC systems without FW nodes for cros_ec_ucsi, + * the driver should be added as an mfd subdevice. + */ + if (cros_ec_check_features(ec, EC_FEATURE_USB_PD) && + cros_ec_check_features(ec, EC_FEATURE_UCSI_PPM) && + !acpi_dev_found("GOOG0021") && + !of_find_compatible_node(NULL, NULL, "google,cros-ec-ucsi")) { + retval =3D mfd_add_hotplug_devices(ec->dev, + cros_ec_ucsi_cells, + ARRAY_SIZE(cros_ec_ucsi_cells)); + + if (retval) + dev_warn(ec->dev, "failed to add cros_ec_ucsi: %d\n", retval); + } + /* * UCSI provides power supply information so we don't need to separately * load the cros_usbpd_charger driver. --=20 2.53.0.1213.gd9a14994de-goog