From nobody Fri Dec 19 03:04:00 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 6AACB30E83B for ; Mon, 13 Oct 2025 20:34:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760387661; cv=none; b=dG90Rhb2P+jgALJxCqvpPlCCAU4qu5avJbRdmvsssyP6IPjq0x/HIwPOA9sCYgQiXgMjtBPBozgiQJ1CjY+Oo8Fuu9gVy7SwWdn08eEGh9CZiLs5THybg3iZkXvO3WmKdgEGnUwTm02403rJ1Qy6mAfr78FCM5wjkHZV+1OInhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760387661; c=relaxed/simple; bh=AW0V5P1Mf/cKqSJ4kn7YwKqdZhOe9eDE0D37bytSyik=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ga2O4bt1Z5m7plHSUwiW16WqndBVH1eqlJFg0xur6HenJNT3tX/Nd1aeZaMial7LtjqfNJCmq/yLnSq/pnpeEXnfkiCxw1ZHDCdclFbagzhnf5O8t83r3VpkenRHR1WwAY1fJxkRg0Vst29t63kP+ainRvSWmjFlDQokocsfMTs= 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=PIgx4e2Y; arc=none smtp.client-ip=209.85.214.202 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="PIgx4e2Y" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-286a252bfbfso209807855ad.3 for ; Mon, 13 Oct 2025 13:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1760387659; x=1760992459; 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=fRIxa/UzZYfGbKZJakrsYtqcVLritJ5Q3FH0o00R8uo=; b=PIgx4e2YeR6Rb0vn199+LNsaV0OzkQKfT/U2gwqFmeitQEDR2Y/oaORC82PCHFbwvd fgfcTGVXnKajA+/GVMIJ5BK5kiXT2pxVzXM1NuCCLhswGkPgZqzelWC4qOP9sPtwd0AG jESMxNob5JL4h9HBLHfDuYC/QKngmHZCLJfOtKTdT2BBnmKG6xriUmqzO/mOCK1rxBzi hJHkQM4g0ypCQRm5V5tOAET78IH1foHdjAaji9XFq8xVgeUTC5akEKtrgqjNb5iq5FHd JN+4I5xJeUlJfrLRCZZARVK62Y4obU4Fd+p7qkDMQRsJZh4FKT4K9/8neAm6DaPClQxY wxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760387659; x=1760992459; 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=fRIxa/UzZYfGbKZJakrsYtqcVLritJ5Q3FH0o00R8uo=; b=oxio2N6rDkY5lqmb2khIKEUwo46cSiYpPGkVx8m+/OCo1VfyoetmVCKNt7flNggsiu ziptzQGIHsAiNMElygHCftM5Mn2gVzZp4mAeXiORgk4n50Kky5TEo7sGhgmzSOsP9G9w z42soFJRD9sY8spc+anI/g12gv4DbB6Jip4O0MSqJNJLhBqKDsTW0FV1OXBhAdOW9y27 DnbJIlMlevqqJkovZDaZZeui60kulUQGlb2T/GZzcDNnFHV3Gz29ANgDeIKW2bLQoUIG hRRIkRmbQRBnWL7QsmuwK46LRFCcyVN21G0MEHm1Y/TtLaOALz71M5oRLz3Ni+8uY6d1 HqLg== X-Forwarded-Encrypted: i=1; AJvYcCVwP8Z81p3yNK68Nfy0Tt8qACGNNq5X1jAGxRLvtV3cnK0vNW5aQagNAt1Jji5iJJGbMG6FI4+APt7Mbuo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzf7zZiZJST8KfkCQReqhkC4pAP8sOuNWkVuayyFUrzZWtgmJc9 MAKN9iW6tDPbHtP+ggVK47+3tSMXKo5IsSEduAelSIKQUbFe7BfwOx7xScH3JbyyG7kDTFMR5WW RjxxEmg== X-Google-Smtp-Source: AGHT+IGfxe1pre0Ru6WgDcMEJLC2GoGSa7ujgL6qXJIB7Yn79ai4Bf73VFPBxmxv5ikoVklpodNHzkq0LDc= X-Received: from plvv9.prod.google.com ([2002:a17:902:d089:b0:28e:804c:cc96]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e786:b0:26e:7468:8a99 with SMTP id d9443c01a7336-290272c18e1mr271502235ad.36.1760387658511; Mon, 13 Oct 2025 13:34:18 -0700 (PDT) Date: Mon, 13 Oct 2025 20:33:26 +0000 In-Reply-To: <20251013203331.398517-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: <20251013203331.398517-1-jthies@google.com> X-Mailer: git-send-email 2.51.0.858.gf9c4a03a3a-goog Message-ID: <20251013203331.398517-3-jthies@google.com> Subject: [PATCH v4 2/3] usb: typec: cros_ec_ucsi: Load driver from OF and ACPI definitions From: Jameson Thies To: dmitry.baryshkov@oss.qualcomm.com, akuchynski@chromium.org, abhishekpandit@chromium.org, krzk+dt@kernel.org, robh@kernel.org, bleung@chromium.org, heikki.krogerus@linux.intel.com, ukaszb@chromium.org, tzungbi@kernel.org Cc: devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Jameson Thies Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for cros_ec_ucsi to load based on "google,cros-ec-ucsi" compatible devices and "GOOG0021" ACPI nodes. Signed-off-by: Jameson Thies Reviewed-by: Heikki Krogerus Reviewed-by: Benson Leung Reviewed-by: Abhishek Pandit-Subedi --- drivers/usb/typec/ucsi/cros_ec_ucsi.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/cros_ec_ucsi.c b/drivers/usb/typec/ucsi= /cros_ec_ucsi.c index eed2a7d0ebc6..0c19ba84d11c 100644 --- a/drivers/usb/typec/ucsi/cros_ec_ucsi.c +++ b/drivers/usb/typec/ucsi/cros_ec_ucsi.c @@ -5,11 +5,13 @@ * Copyright 2024 Google LLC. */ =20 +#include #include #include #include #include #include +#include #include #include #include @@ -235,7 +237,6 @@ static void cros_ucsi_destroy(struct cros_ucsi_data *ud= ata) static int cros_ucsi_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct cros_ec_dev *ec_data =3D dev_get_drvdata(dev->parent); struct cros_ucsi_data *udata; int ret; =20 @@ -243,9 +244,16 @@ static int cros_ucsi_probe(struct platform_device *pde= v) if (!udata) return -ENOMEM; =20 + /* ACPI and OF FW nodes for cros_ec_ucsi are children of the ChromeOS EC.= If the + * cros_ec_ucsi device has an ACPI or OF FW node, its parent is the Chrom= eOS EC device. + * Platforms without a FW node for cros_ec_ucsi may add it as a subdevice= of cros_ec_dev. + */ udata->dev =3D dev; + if (is_acpi_device_node(dev->fwnode) || is_of_node(dev->fwnode)) + udata->ec =3D dev_get_drvdata(dev->parent); + else + udata->ec =3D ((struct cros_ec_dev *)dev_get_drvdata(dev->parent))->ec_d= ev; =20 - udata->ec =3D ec_data->ec_dev; if (!udata->ec) return dev_err_probe(dev, -ENODEV, "couldn't find parent EC device\n"); =20 @@ -326,10 +334,24 @@ static const struct platform_device_id cros_ucsi_id[]= =3D { }; MODULE_DEVICE_TABLE(platform, cros_ucsi_id); =20 +static const struct acpi_device_id cros_ec_ucsi_acpi_device_ids[] =3D { + { "GOOG0021", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, cros_ec_ucsi_acpi_device_ids); + +static const struct of_device_id cros_ucsi_of_match[] =3D { + { .compatible =3D "google,cros-ec-ucsi", }, + {} +}; +MODULE_DEVICE_TABLE(of, cros_ucsi_of_match); + static struct platform_driver cros_ucsi_driver =3D { .driver =3D { .name =3D KBUILD_MODNAME, .pm =3D &cros_ucsi_pm_ops, + .acpi_match_table =3D cros_ec_ucsi_acpi_device_ids, + .of_match_table =3D cros_ucsi_of_match, }, .id_table =3D cros_ucsi_id, .probe =3D cros_ucsi_probe, --=20 2.51.0.858.gf9c4a03a3a-goog