From nobody Thu Oct 2 01:01:45 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 C49082D8781 for ; Wed, 1 Oct 2025 19:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347237; cv=none; b=Ffjqp8suSVsES0UIile2ePqU2bjC/L7XMe/dLz8GzvU0jeAGjxmLhysXAJac3JWkAigiqXTOLjVx9N7aABgiaKLbHe5r97wITZUoDTR1IKZaafsskGxf8yKuOhltqgd/35gPFQ5bnY/kkG66S65dEIvXmw8VpAihmzh1Cfv7acw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347237; c=relaxed/simple; bh=FEpg/7BZxeu5NgwiYBv2Ee+RYqZ1LN0sPgk+srr05OA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AWXrclPKoDrcOpzvdMB0x+cPl1BPIajCn3zk4W1A8jx0x7YmXmcX76+x0L/oSKZLr4GOVUFCKh+hMlvgnqyBV/anORQkUcq4PKicjDmdlsu3TsYF/peHp9LjCVdxk4BFJzhpIYJZtwduLw7So5cnIKSKLuuyJ/4YJcwAnEu8DAI= 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=rHrGUTNy; arc=none smtp.client-ip=209.85.215.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="rHrGUTNy" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b5509ed1854so128639a12.0 for ; Wed, 01 Oct 2025 12:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759347235; x=1759952035; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=KOZcKUaQjl52TKTb2c8zMCvsKmsV/y/lPeyOuQ6q8ow=; b=rHrGUTNyLHt0QEZZ6ADUSGqa1RgO4IG2OJ3oDEUn+s5kqyKSG11/HgcsZwoTejjeUM SN4+XrZE42WcZ3jXWC/ynGoziXjzQPSZpFSSXATNEipi9mjTMI1MlIVGSaah2KwiAaro +e1xYlKikK6SlZDp4fDzP005NwfrSX1fBoTAePWInJ9kIiV8VbGwaw4hOxCh81bWtZEd Fw1O7Je1eUSt5rKF6kziaqmGqlW2X/mV6UMQ3KuddTCVXVzXDSrbbMuDKf0mghcqW2tG S+ESsoyBf7v0pLlHNac2IHALFKPXIL2b7ZcHsTqJQj87oRDVfFJYGxXoxjxTcOgaQnOp UjMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759347235; x=1759952035; h=content-transfer-encoding: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=KOZcKUaQjl52TKTb2c8zMCvsKmsV/y/lPeyOuQ6q8ow=; b=wuQ42hlZDxz+339tGzCvpRYWJS5dqUfe8is9R+DhUiAHzDLIgjI/zLrfc5kYsT6uUP aSPMs22WULXI+67UdqUkq5vqUuWBllOg5DdPbH2KuMKcT664D0UU0+M4puwC97AAmOJS Pq5IC/lECgdyp84nmeNSWZJxHb6pR2TwFRrrio4nQgbClpmaYe+ufMMEecxW/pRHWKYd gUf0gxASwSAuILmzuoBst9pAkp3/vWr7YqG6OD5cXr3QaTh6tLQQ8bNI9YvNXOCZ1bpc 5W4pUyLjW9LopOvwipJoUYGBh93ot8wtKgcCe32bXjKebXpARsLyOglHQ499GLfBbV52 RPRQ== X-Forwarded-Encrypted: i=1; AJvYcCXD95q5jd+oI7ZyGQoeldcuO1Ko5Hx4CFkxfbWqODu+WmwEi44oZw1b+CkmG3yU3vL+idi1z4rt38ZCgb8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9oJEt/3Zc1GiNCFEtTIN2EufOsSDrwSiyxN3qedv2S0M0YYMb UMLa1J0VkzQsC2M40kRVZ7i+xHMRByI5xuDAKptq++0PhJ9GMIFq+3aXhV2HUa/8tAjixDec5kN Mv7roBw== X-Google-Smtp-Source: AGHT+IFYeUo9ghhsjfaPnkIvUWWb4I4GUIwXFFyCVFrvfzUwD+cx16qLBp9A0yGOlezJ5enJQwgNYB7XxzE= X-Received: from plblb8.prod.google.com ([2002:a17:902:fa48:b0:24c:7829:4af6]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2446:b0:274:3db8:e755 with SMTP id d9443c01a7336-28e7f2f7565mr44337445ad.30.1759347234575; Wed, 01 Oct 2025 12:33:54 -0700 (PDT) Date: Wed, 1 Oct 2025 19:33:41 +0000 In-Reply-To: <20251001193346.1724998-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: <20251001193346.1724998-1-jthies@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251001193346.1724998-2-jthies@google.com> Subject: [PATCH v2 1/3] dt-bindings: chrome: Add Cros EC UCSI driver From: Jameson Thies To: 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" Chrome OS devices with PDCs allow the host to read port status and control port behavior with UCSI commands sent to the embedded controller (EC). Add documentation for cros-ec-ucsi node which loads the Chrome OS UCSI driver. Signed-off-by: Jameson Thies --- .../bindings/chrome/google,cros-ec-ucsi.yaml | 71 +++++++++++++++++++ .../bindings/mfd/google,cros-ec.yaml | 4 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-ec= -ucsi.yaml diff --git a/Documentation/devicetree/bindings/chrome/google,cros-ec-ucsi.y= aml b/Documentation/devicetree/bindings/chrome/google,cros-ec-ucsi.yaml new file mode 100644 index 000000000000..2121776e3ff0 --- /dev/null +++ b/Documentation/devicetree/bindings/chrome/google,cros-ec-ucsi.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/chrome/google,cros-ec-ucsi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Google Chrome OS EC(Embedded Controller) UCSI driver. + +maintainers: + - Abhishek Pandit-Subedi + - Andrei Kuchynski + - Benson Leung + - Jameson Thies + - =C5=81ukasz Bartosik + +description: + Chrome OS devices with PDC-based USB-C ports expose a UCSI interface + from the Embedded Controller (EC) which allows the host to request + port state and control limited port behavior (DR/PR swap). This node + allows the host UCSI driver to send and receive UCSI commands to a + Chrome OS EC. The node for this device should be under a cros-ec node + like google,cros-ec-spi. + +properties: + compatible: + const: google,cros-ec-ucsi + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + +patternProperties: + '^connector@[0-9a-f]+$': + $ref: /schemas/connector/usb-connector.yaml# + required: + - reg + +required: + - compatible + +additionalProperties: false + +examples: + - |+ + spi { + #address-cells =3D <1>; + #size-cells =3D <0>; + + cros_ec: ec@0 { + compatible =3D "google,cros-ec-spi"; + reg =3D <0>; + interrupts =3D <35 0>; + + typec { + compatible =3D "google,cros-ec-ucsi"; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + connector@0 { + compatible =3D "usb-c-connector"; + reg =3D <0>; + power-role =3D "dual"; + data-role =3D "dual"; + try-power-role =3D "source"; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml b/Do= cumentation/devicetree/bindings/mfd/google,cros-ec.yaml index 50f457090066..646bc81c526f 100644 --- a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +++ b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml @@ -99,7 +99,9 @@ properties: gpio-controller: true =20 typec: - $ref: /schemas/chrome/google,cros-ec-typec.yaml# + oneOf: + - $ref: /schemas/chrome/google,cros-ec-typec.yaml# + - $ref: /schemas/chrome/google,cros-ec-ucsi.yaml# =20 ec-pwm: $ref: /schemas/pwm/google,cros-ec-pwm.yaml# --=20 2.51.0.618.g983fd99d29-goog From nobody Thu Oct 2 01:01:45 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 7E54A2F0666 for ; Wed, 1 Oct 2025 19:34:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347242; cv=none; b=NzUZvlg+CHM8dDb6HEt7h3YIDNwm8BY1MAzqgst20Uo+N2Eyv1a5mc7KZxZ6fpPBX4gnit4QUc8PLyeK8kfIWujRc+549iaLi2QkpkAWvhhuZwrUckfdmo7jRwpqOI5qyTz9AmdLvvobd1PtJ5DokUDQctLk48mywV0BZMnOtKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347242; c=relaxed/simple; bh=Re7GUviQQ/McZMZXcizPzU9VQkGIF/9Gqs/MVdCmSq4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gSXTH3LCKGEYhAUm1Mxm8ejL0y7GVEGXnWnEtk3zLJVRdUpfbREkl88AHCPdOhgT/3bs2fCifVoPSm0P+JlDh/2IOQW4Ynbc40CIT+gTECHVarEMwWZ8x9FfvfEA2+8u1Yj5jAHucvAeGApH/r6v67kjtW/LRtYJMRu8we0zStM= 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=X7QMDq7q; arc=none smtp.client-ip=209.85.215.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="X7QMDq7q" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b5533921eb2so139412a12.0 for ; Wed, 01 Oct 2025 12:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759347240; x=1759952040; 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=Ab9LbOojENiRCLzu2+LM4yAW/ppnt27Oi1gZ0mzkbeM=; b=X7QMDq7qsB0Mjqacfk2ssPAEIMSxEi65WKNktAXYu7j6hXe+5pPdPBUi18iJxy3HSm YO8ztCkct0lGueS6R3IAqrrjKrQpk5iNcykoR0YtmUIKurIIF1nMsoBjej3EFsWTDFud jf1UMiKpPybosXoQfyu3hsb90iZKWLFuVraac0aC2cpzKJdtMWzqZDTFc6+7QKd5qS8g 1gOr7eSpubS3JEqdtnyQ2QnE2b+7TbPUX38OBtYL9bSwdGdewTI4U91FjIul+iPEbJ6G C40eEFxc0S0Qu4z6Y2OYGYAh1ru9qQ8hNDKWrfFVdcYziSiUT3mxQxqp4CTQ1bgz5Hkr z19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759347240; x=1759952040; 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=Ab9LbOojENiRCLzu2+LM4yAW/ppnt27Oi1gZ0mzkbeM=; b=ci/EK2WxTXo8YixBQNWbKDx1/0NWSJ4mcbEKh5W4oyxqfRUNVNadxWu4mztudeU3Vl 21KD64DmtKpiHXK6yXKdqCoLz/JUlFkE/KjbWxZZ9+SWb677n50Zcoo3Ng8Jar3GGXm7 t064bwVNgeX0yu+sOPINmS0yjqawJZ8iFRz9QtiAPh5YG7KDacSsaiC1U9sjqHu4HRRp ljIeqhNmUu/3NxnxrSSDmBOM3wyprAXa7HAcEYO9yR0+XI2fF15nzf9upt3vxj95Jwsa HAE2lPfwWQE6Vi75cDe9PogTc0lJIEGuQVJ9AUTp7ggbQX4l6SOdsul/a8WZx2bO8rsi PIpw== X-Forwarded-Encrypted: i=1; AJvYcCW4Xua4Q3585U2Nf7OXbAh4kmwrK85HHWJvodTL8BmdKnxLXK07yyzBgnI4gv7FlzFMzNQ89DYPPq2u5PU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy18RCqPWKTGqNOM7YauYalRTrvWNiPgilEuwzAxgSW5X5DQTWV cjqox6MFH3qvSVeZQQnjZNoZJAyqsb6cQe4g9VFMMBGDsddyRqje0iXviMtlN/leEuq+XV9sOeB MWlYl7Q== X-Google-Smtp-Source: AGHT+IHpeChB7wBWGbIToLlpa6Wkhfvaeaky3iS+MzUWr5j+7Q7cE+k6HmDkvIJbqJHBJhco83UQXyJFy4c= X-Received: from plpc16.prod.google.com ([2002:a17:903:1b50:b0:28e:8363:fb93]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f70b:b0:26a:589b:cf11 with SMTP id d9443c01a7336-28e7f315a95mr52240345ad.43.1759347239903; Wed, 01 Oct 2025 12:33:59 -0700 (PDT) Date: Wed, 1 Oct 2025 19:33:42 +0000 In-Reply-To: <20251001193346.1724998-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: <20251001193346.1724998-1-jthies@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251001193346.1724998-3-jthies@google.com> Subject: [PATCH v2 2/3] usb: typec: cros_ec_ucsi: Load driver from OF and ACPI definitions From: Jameson Thies To: 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 --- drivers/usb/typec/ucsi/cros_ec_ucsi.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 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..3d19560bbaa7 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,7 @@ 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_ec_dev *ec_data; struct cros_ucsi_data *udata; int ret; =20 @@ -244,8 +246,13 @@ static int cros_ucsi_probe(struct platform_device *pde= v) return -ENOMEM; =20 udata->dev =3D dev; + if (is_acpi_device_node(dev->fwnode) || is_of_node(dev->fwnode)) { + udata->ec =3D dev_get_drvdata(pdev->dev.parent); + } else { + ec_data =3D dev_get_drvdata(dev->parent); + udata->ec =3D ec_data->ec_dev; + } =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 +333,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.618.g983fd99d29-goog From nobody Thu Oct 2 01:01:45 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 AADDA2FDC41 for ; Wed, 1 Oct 2025 19:34:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347245; cv=none; b=eEu+ezOA4XuGLlleRzuYT9s2nrU1k2QrRJlRV8ugvMO7nrMuah7jm1gG5zDA/+fyroGph0x4fECp9+c6khxJhqJH1q/I+fT1AY51Kb2LK59yDNPkOTDaFinuZKdeMWjalVi+7E5TjfM9XDlxZ0S3xwP43LoM57PXO9JWPRY0qkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759347245; c=relaxed/simple; bh=hjVBX5JMtGNkNIWN8eSwy2vTEb4tpKAWKxH7zqEEOj4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=djQnJCvgogXYLN8ymFVKfBgoebIO1mS33DfaEqvHEHTD/1VKXXqSYkCYcW2+xgCg/KPA2D49f5kWY2e62hK4Z83mN6XlVbCZBY99/52XJ8LePE9p5944XtNote1bAUG7QQVYperFhUaliAZo4NP+DTOfxyyx4xlyk1S4FCaNYKQ= 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=WldEHZah; arc=none smtp.client-ip=209.85.215.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="WldEHZah" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b5527f0d39bso236085a12.2 for ; Wed, 01 Oct 2025 12:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759347243; x=1759952043; 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=uUFn2s+3Cx+wxXVgN5taoVqNZX8a68N/oLppB9MWElo=; b=WldEHZahpVyAApuvqtQGaXjXeyXFkUHxvKaxEZZHiXkF6icrwM12MVi8ZVTGwrzCNJ 9QNIHaKiTqlZZOaYrjMf2lk8kmF5rw2JpGnKsbYxk54fUoBbhb3Ftkxf3ZtAwu44X1S1 dJTYKe0+J8ASmVC5Rl2rVDb19HVP3tC7VwwwWUZbSfIwnu4EHkLlQluJCjDBiT5NfJbB sbHNwM0c+7JC6QufjpNoGRgg5uHi8jZFwrQCcesp3+JbHUne2mbTDDIQBcm1qX6Md+vw 8Vfjt9uAUzy3JSiemMiC5DtEmUmoCVcTvAyPQI5TPdh+ya0VR68hD12c1a5HnUglMqhv iWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759347243; x=1759952043; 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=uUFn2s+3Cx+wxXVgN5taoVqNZX8a68N/oLppB9MWElo=; b=nuMk/hmsVprLPRGuiKbmjkytBAL11Rq4KSMvCWxcMRI7boZ+JNL34NMzvKqTfuGRBE B++lF0R8KaLn+rp6aahLHP61t43/JJEdTUTwrd4ht9knnxo06SIhS2WU1q5ppl+ETFSr 8O2PUjFymR8/UPWPp2CSHIB3rC9zPRYy6Vs8D8tIpowikLIBunawciYxwzEwlcPp9Trw 4Ph6coLSZKPCQdl7X1/DYkqmlE+byT6dDJdEY4uhx2tYoK0wgx+YcH9ktEdH3PCeEX0B cne5+RvHe9wtXPkUpC/3IFc9HrBrhf0bmk++t0Tyi+ijvzEDB9sAdEq7S7rbz2SpQd+m OOMA== X-Forwarded-Encrypted: i=1; AJvYcCWbr589M9MR97Z+erQBH6c3K6urzRs9I+I9K+0W2kz1kwrforBPKVej8ORTmasTwRX9hPsAA9lohDyi3tg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg2VZD6WhPs7+G2W0blQ/JEhsraBf86V9le0+zC+96iKhT3d+w HiRiwgF2UCDIqDKkd5Fk85MpyS/hL3nK5x4dc/mh6TUZqFwwBMLKnLrzmjNS9HKloICu41VrD9/ 72L82aw== X-Google-Smtp-Source: AGHT+IEuxbvUY4/T7dbFkwsFtVOPEwyefNF8rTwItwF8+xb481LkR2wSDNCKWoFQXCU9ZimIwrDCqEO8hzo= X-Received: from plkp3.prod.google.com ([2002:a17:902:6b83:b0:27e:ec80:30c6]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:19e3:b0:26a:8171:dafa with SMTP id d9443c01a7336-28e7f2c5848mr68118035ad.21.1759347243022; Wed, 01 Oct 2025 12:34:03 -0700 (PDT) Date: Wed, 1 Oct 2025 19:33:43 +0000 In-Reply-To: <20251001193346.1724998-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: <20251001193346.1724998-1-jthies@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251001193346.1724998-4-jthies@google.com> Subject: [PATCH v2 3/3] mfd: cros_ec: Don't add cros_ec_ucsi if it is defined in OF or ACPI From: Jameson Thies To: 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" 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. Signed-off-by: Jameson Thies --- drivers/mfd/cros_ec_dev.c | 40 ++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index dc80a272726b..b0523f6541d2 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, @@ -177,6 +173,16 @@ static const struct mfd_cell cros_ec_vbc_cells[] =3D { { .name =3D "cros-ec-vbc", } }; =20 +static int ucsi_acpi_match(struct device *dev, const void *data) +{ + struct acpi_device_id ucsi_acpi_device_ids[] =3D { + { "GOOG0021", 0 }, + {"", 0}, + }; + return !!acpi_match_device(ucsi_acpi_device_ids, dev); +} + + static void cros_ec_class_release(struct device *dev) { kfree(to_cros_ec_dev(dev)); @@ -264,6 +270,30 @@ 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)) { + struct device *acpi_dev =3D device_find_child(ec->ec_dev->dev, + NULL, + ucsi_acpi_match); + + if (!!acpi_dev) { + put_device(acpi_dev); + } else if (!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.51.0.618.g983fd99d29-goog