From patchwork Wed Mar 12 19:59:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 14013809 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 1491D1EC012 for ; Wed, 12 Mar 2025 20:00:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741809617; cv=none; b=Rv03XIhZti6EIS+vb399U6qTHAaKEWLCchBCn6OtMCSh9UsLc4a2w8eOtPp75KsJN3NlC8fw31/z//BnZUI6nXtASP9/66cg3hIlr9SQA2Nf5hAqPoJ2SXFykiUtj0qFgKBmArjcTuNgptcEZcdgnoD8ePLGtLr3TkhACNxpurM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741809617; c=relaxed/simple; bh=WvRKKyrxPM0AndWhf5s5lTyd+m2bVCqjFHn7YN0dKLs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mE7eYI418e8rezSkvi68F2zZ1YPHPrmPQwkOgCQ+LtSFhiroB/oW6e/Ek+EpWh8ZNytbZZ/Dl0ZaRlDliE/JROGRopL8P6qbreHWuhtxO0AWb9h4N/xMvqCSF5QPnC9+T8Df3tbZameAIPQ3kEdZe5EaLE5n1lv2GZcMu+7wAUs= 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=FkNTLdjx; arc=none smtp.client-ip=209.85.216.73 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="FkNTLdjx" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff798e8c3bso392193a91.2 for ; Wed, 12 Mar 2025 13:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741809614; x=1742414414; darn=lists.linux.dev; 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=wfELBOAwKsIn4f/h6RBx4PQYztLIiCjc1rnfMpVEC8A=; b=FkNTLdjxs0yjzGIZLNPBhrf4kv2QC3nhWFE6vKOMZZOENRa00pmJ4V0p+oOJCzmPEr oy14WNvkpsOT+s5TDwQnRfy91gaXdLnhsaTJ0kmGOL9/qc/FXifUORd4xTmRDxIeUXxj 2gI3Juvx2btQ+546Mp/B9SMjTxVZKAtksf/U/aJcBBPJD7IFq7uH3DE+Aitbfx6JvVWj ZuxxarVEMSqJl+Zwez8jhuyo+BwMf1fxcgRH8U+I2yNwAECuT7WnfnxbjOTap6Lc77C/ ORK9RdvZETLSNru0cC507sDl7bP9B50nTjYp+3TgEbfO8QACjd/M0YFUIJa+KRkyGoAh Aeiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741809614; x=1742414414; 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=wfELBOAwKsIn4f/h6RBx4PQYztLIiCjc1rnfMpVEC8A=; b=W3uJQnxvIlpH4LOBaHq/mUJH5+sjUwABPcgnYip0lw8mNCmjg/2dAol0AYjx7ynQ/z 9614wCdWUe56IYQRjP5eDoJjevy/WytjYqys92j/GVg3R8XBlwrVttuQlEBuET8Xg+ty 6XApQPgedImdUgpfmeX3MDM5bIOPCghp48OG/Youm7cisRvpTa919eZSXDuHDXQrdBKk d2cJBhfrQxyIUVq8akFsWjOw00XH6k032XjQRBcFXRl206rTK6J6YlXnYsFQB4VDqGna 0otBzWi6ncK+AD/BALvHiIMLPdMK8hJWuCLzVNNWbq3jZUQxWeruZC4RN3GZpj/W5Ek7 1F1A== X-Forwarded-Encrypted: i=1; AJvYcCXVU2p6B8tYSyiKqO5KnG41plUGDplH6lk595c6Xp5/vUBUGKXv7EnwSyVSby4v7zlqNxVgg9EWpqXj4xNSoDU=@lists.linux.dev X-Gm-Message-State: AOJu0YyTjr9BfbHV08CRG4wB/KVlICLMC5U95Gn9m0Qoc/HZrxedJsC5 9dDwxd8eJD8CXaVB1/+42bhRsKWrV+3dArq2L2a4NH6P4gboQh1+0nRm+fII5bv6V409B9YcV1+ Mcg== X-Google-Smtp-Source: AGHT+IE+MbUq96ItG8DzcFSeVabSk7TgmT8HCVRXFsqek/lzPUV/vp4+cJRf1j5i4c+BNQLVVm3ovOJuqD0= X-Received: from pgbfm12.prod.google.com ([2002:a05:6a02:498c:b0:ad5:2dcc:552b]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c79a:b0:1f5:8126:8a5d with SMTP id adf61e73a8af0-1f581268cd8mr18624416637.17.1741809614269; Wed, 12 Mar 2025 13:00:14 -0700 (PDT) Date: Wed, 12 Mar 2025 19:59:10 +0000 In-Reply-To: <20250312195951.1579682-1-jthies@google.com> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250312195951.1579682-1-jthies@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250312195951.1579682-2-jthies@google.com> Subject: [PATCH v1 1/3] dt-bindings: Add cros-ec-ucsi to cros-ec-typec device tree documentation From: Jameson Thies To: tzungbi@kernel.org, ukaszb@chromium.org, bleung@chromium.org, heikki.krogerus@linux.intel.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, groeck@chromium.org, swboyd@chromium.org, akuchynski@chromium.org Cc: devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Jameson Thies Add documentation for the cros-ec-ucsi device tree definition. Defining this node will load the cros_ec_ucsi driver which is used for USB-C port control on PDC based ChromeOS systems. Additionally, update mantainers list to reflect changes to the ChromeOS USB owners. Signed-off-by: Jameson Thies --- .../bindings/chrome/google,cros-ec-typec.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml b/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml index 9f9816fbecbc..ab39c5280681 100644 --- a/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml +++ b/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml @@ -8,17 +8,24 @@ title: Google Chrome OS EC(Embedded Controller) Type C port driver. maintainers: - Benson Leung - - Prashant Malani + - Abhishek Pandit-Subedi + - Łukasz Bartosik + - Jameson Thies + - Andrei Kuchynski description: Chrome OS devices have an Embedded Controller(EC) which has access to Type C port state. This node is intended to allow the host to read and control the Type C ports. The node for this device should be under a - cros-ec node like google,cros-ec-spi. + cros-ec node like google,cros-ec-spi. On TCPC systems, ChromeOS should + use cros-ec-typec. On PDC systems, ChromeOS should use cros-ec-ucsi. properties: compatible: - const: google,cros-ec-typec + oneOf: + - items: + - const: google,cros-ec-typec + - const: google,cros-ec-ucsi '#address-cells': const: 1 From patchwork Wed Mar 12 19:59:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 14013810 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 260511EC012 for ; Wed, 12 Mar 2025 20:00:17 +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=1741809619; cv=none; b=MIYzOu3qX5riCD1mQickeGa+tSnWPFM3zwT/2dBC3ps4na6Lg46cUMfUCO2++nVJy/muYWPmazygGff31Hzz49FA2bXJr+QVB5LHADQczIPyWAIJT5S8ai1yKIMzE5hOX3M3lsBi3hndpzIUIqSUTNP8eL+WOFbFVjZoNXHWURI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741809619; c=relaxed/simple; bh=0GWy3rp0F7KpgF0wRntfFfUSkJ3mXo1eZ4Tv31fz+NU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ARja3jSM/n7OXCbPE+Ktm/ITpaQ+2TS3TMT/CQT6RGEJQnT9Y9u/1MKDUlyYwZKNkvDw+dTNJyj6uKXqVBkn9u5pmniY/AXspm9avO12kmlYW2GkdS04W3PUEq7ziQo6DOXB1aMhtC/e6qTsVE7+6bxAb5hlJaGnwdiBkXicWpE= 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=rZooeoAH; 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="rZooeoAH" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2242ce15cc3so3312595ad.1 for ; Wed, 12 Mar 2025 13:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741809617; x=1742414417; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VDEU9Q/7+kilAtJ4k6780hVL8+VoEsG1QL4aEk8tmxQ=; b=rZooeoAHCunQF+C2jLVEAlpCtk6gpauVJ40dGdLkToqHlgk8QxAW5ym45pNtXbRILO DamHU7zcuGdBDrGbYTICVyOMEylzuEaJpe9fUxi2JLW4kYRfBWYXqOvrRnO2UAKYGM7u QEA/QKoT5WrBgDEVvDG8E+bCOoDKcsqOotZI2eOLBXcY8wU4J51S7DJIGCP8O62JNWlv E26RMisq/bL47DiD4e6AXImAlF1e8c/z3Aymv0m86mMAZBBw09DQIiG5OkSxumjYoY/R qSUaQk/J6sf9xvAoU5uSr9SSebvmXD79fwmdWU7oEP4pBvGV6Ce42whpcHtKuESuwujz AHIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741809617; x=1742414417; 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=VDEU9Q/7+kilAtJ4k6780hVL8+VoEsG1QL4aEk8tmxQ=; b=avk3j9WatjJS0zGrQk+lGjlZKAH8h7ug7WBLwa4LMmxUPu132Y8n334BtsQmiW7mJE mkLdxk7HsPv83dlQZjzuu5q4NwRVheknVuUb+NSytKNKMK2XADpRC95MUGwXMCuT4f7Y xdysPLqaOS9lewQlW7h8LJ2OFiCsb2T+6hLFroQ1qzArV782APiKfOIwbo2J0me0m6s4 xi6VfNaZjPnD6siR86A7tEovn5t7aDQNBiR94P5tBg41koBia92sDLbBM/WWKcVIMtsR 6YYbty/TpmvtWKVjNVz7TJ9WriAZ8zCe5FRHraXSjq4XgQ3mGr5ZbP+sAsz4TIIOYagU a26w== X-Forwarded-Encrypted: i=1; AJvYcCWoV8gyE0MKXljkFlyT1qDKuvohuxvugBfsIBpx4P1rpgeLpXhUYzrFnEGc8acqO6gBjBvJaXKooHRVEbzShtQ=@lists.linux.dev X-Gm-Message-State: AOJu0YxwJHAdg9aFLf7nzkomJeWQSSi1Tk7rQRUAhmuP8pvrY3LLwWJQ 525ZYilm+ih1LEjd1Megjb+VtaDNq3NgcuRolwr1hljA8R0I098sEsKR5DxrrNGmtc+HSOyz1Qx g8w== X-Google-Smtp-Source: AGHT+IG+7wN0jLCNhozwudp+CmZ2bIOC2JWCQMC5PPVbBuF1mi37k+/+m0ELnNvF8x64iohsHTAqLd5wRsg= X-Received: from plbjy16.prod.google.com ([2002:a17:903:42d0:b0:223:37b7:2388]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:234d:b0:220:c34c:5760 with SMTP id d9443c01a7336-22428c240demr280258275ad.51.1741809617329; Wed, 12 Mar 2025 13:00:17 -0700 (PDT) Date: Wed, 12 Mar 2025 19:59:11 +0000 In-Reply-To: <20250312195951.1579682-1-jthies@google.com> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250312195951.1579682-1-jthies@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250312195951.1579682-3-jthies@google.com> Subject: [PATCH v1 2/3] usb: typec: cros_ec_ucsi: Load driver from OF and ACPI definitions From: Jameson Thies To: tzungbi@kernel.org, ukaszb@chromium.org, bleung@chromium.org, heikki.krogerus@linux.intel.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, groeck@chromium.org, swboyd@chromium.org, akuchynski@chromium.org Cc: devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Jameson Thies 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 | 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 c605c8616726..d916893b8908 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. */ +#include #include #include #include #include #include +#include #include #include #include @@ -226,7 +228,6 @@ static void cros_ucsi_destroy(struct cros_ucsi_data *udata) static int cros_ucsi_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct cros_ec_dev *ec_data = dev_get_drvdata(dev->parent); struct cros_ucsi_data *udata; int ret; @@ -236,7 +237,14 @@ static int cros_ucsi_probe(struct platform_device *pdev) udata->dev = dev; - udata->ec = ec_data->ec_dev; + if (is_acpi_device_node(dev->fwnode) || is_of_node(dev->fwnode)) { + udata->ec = dev_get_drvdata(pdev->dev.parent); + } else { + struct cros_ec_dev *ec_data = dev_get_drvdata(dev->parent); + + udata->ec = ec_data->ec_dev; + } + if (!udata->ec) return dev_err_probe(dev, -ENODEV, "couldn't find parent EC device\n"); @@ -317,10 +325,24 @@ static const struct platform_device_id cros_ucsi_id[] = { }; MODULE_DEVICE_TABLE(platform, cros_ucsi_id); +static const struct acpi_device_id cros_ec_ucsi_acpi_device_ids[] = { + { "GOOG0021", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, cros_ec_ucsi_acpi_device_ids); + +static const struct of_device_id cros_ucsi_of_match[] = { + { .compatible = "google,cros-ec-ucsi", }, + {} +}; +MODULE_DEVICE_TABLE(of, cros_ucsi_of_match); + static struct platform_driver cros_ucsi_driver = { .driver = { .name = KBUILD_MODNAME, .pm = &cros_ucsi_pm_ops, + .acpi_match_table = cros_ec_ucsi_acpi_device_ids, + .of_match_table = cros_ucsi_of_match, }, .id_table = cros_ucsi_id, .probe = cros_ucsi_probe, From patchwork Wed Mar 12 19:59:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jameson Thies X-Patchwork-Id: 14013811 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 6BE5B1EE017 for ; Wed, 12 Mar 2025 20:00:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741809621; cv=none; b=QV3tnfomnf9962f68jz+60p/w+D5DLwWsgxRlD940YXWISn1qrmidyAYiN7A2DSN2j/pAy0SWUf5CzgDzny3ZM4HeT7OhkJLpx/jcw19xQQK0CL7bpf1fIxyLqoUpLNkqanUyX/ZuZxKOkqaThpGIRSu5nt2aytMwdboLMNLVw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741809621; c=relaxed/simple; bh=05+7dVWuOECHdsMMg1bh5t6jzIqyq0QLMWPcZxTVIQY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UtkMYZ5w6VTjVhsf5hcJP0IJOduDwzCXeNgK5IisL+xKz4ZT2xcxc5S7hZNLT5iH5yaAc0Z4MTZh3mWWUoYCkDdiBTgV5J79hTP4rlHhq1tZBenEXje7+yhJQdqf6fiXJzbAPxfO7XN2SjXL8Ia7/mBZ+FENEomBcvuY72K6lTg= 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=muj/B9Lm; arc=none smtp.client-ip=209.85.214.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="muj/B9Lm" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-223477ba158so6177295ad.0 for ; Wed, 12 Mar 2025 13:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741809620; x=1742414420; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=L17RDKhWUu6oMmo9Xalv19pEsxNZy4ncT3jPzEM2UX4=; b=muj/B9LmOwffWRJTRTQyWq/Wbo1ZvyLnSbynJWOIDW7fY1nTV0E9AnnUzPArpGkZB0 4j/HolalKpVGmP28dW+0O1ikDXo+rGqyu/cOT2HyIPhucMBAj3XOxmShz4zu7ACrFR8g I9h4xLFLmznYkTJoBhjt/AidyQCJg6ELgjm+GmtdlukxNhU9rKWMAFt+1U5W/X7coZja 6G3yJCAUNYsiwlIA0JgWkVuIs5NL8afxpG/wmPIKznfD7jPELUefsrXr4eSHjHlju4MX eI4BT7fk09VOR94Rt/JEesTKe+m5kRYaAMUDXjunca5BYRvNU6XFo6t2IZT/0vw9chj0 LUOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741809620; x=1742414420; 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=L17RDKhWUu6oMmo9Xalv19pEsxNZy4ncT3jPzEM2UX4=; b=owLGZEFHaYlG8ulljNHPlxpIByD4Luw6ETi3EN0M7pwBll6JsIuSKwMxNZpgOwQBKC DiUY6g1a0mbHOpPORh2eGtGN7CGX1oAEkXOdTyfBbG5p1oU8DIYHFtgyAgbANmlcvMcE RdgLUW0F5d2ak9SJTkWl7QsFyZYoGp3HjtfJWT5vtqW/2lu467fIyD4R7bm+zdYz0yyM JV1NomnZnCaR9SbZF5BNR0UywfxTOnQs69nV5SvHGsJzrAx0rnanSXBbA820eECO+Ewm qQom/Kr0LHhtKrTCug+4uexYQqu2k9bl7hv4qwA114CpOl4jxxaqFWP93U0A7Y0jM9kD q1iA== X-Forwarded-Encrypted: i=1; AJvYcCV1LgGPgSBie2oaFPyH2IGY1gUaEpChHfk3EDmRP2FyotZ/F5P6qA+H8yw4+ITSJ8XrccFhLrxMGrjyPy4aHzA=@lists.linux.dev X-Gm-Message-State: AOJu0YzGrKsRJAuqhPNNvLwMIJ5o5aYfqsQZF6GN1074jnoqo4INUEON sYMQ4V9hk1Yg6RfdagV5Yk4mdbJxXjYKifYwmtHnq1EIYSVrqURNvwHjp0RaldLKT+Eu2bey3iy //g== X-Google-Smtp-Source: AGHT+IH4K/47qeRDt1YjBAXcU3FOe5IP5JjThNYGWQevxtIT/iQUAQ0NeIwRHC3jFWJ6xWJBzD8leYYbizE= X-Received: from plbmp13.prod.google.com ([2002:a17:902:fd0d:b0:21f:56e1:c515]) (user=jthies job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2405:b0:224:24d5:f20a with SMTP id d9443c01a7336-22428bfdba7mr411018645ad.48.1741809619744; Wed, 12 Mar 2025 13:00:19 -0700 (PDT) Date: Wed, 12 Mar 2025 19:59:12 +0000 In-Reply-To: <20250312195951.1579682-1-jthies@google.com> Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250312195951.1579682-1-jthies@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250312195951.1579682-4-jthies@google.com> Subject: [PATCH v1 3/3] mfd: cros_ec: Don't add cros_ec_ucsi if it is defined in OF or ACPI From: Jameson Thies To: tzungbi@kernel.org, ukaszb@chromium.org, bleung@chromium.org, heikki.krogerus@linux.intel.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, groeck@chromium.org, swboyd@chromium.org, akuchynski@chromium.org Cc: devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Jameson Thies 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 | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 9f84a52b48d6..5fb6cd20c5ec 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -5,6 +5,7 @@ * Copyright (C) 2014 Google, Inc. */ +#include #include #include #include @@ -128,11 +129,6 @@ static const struct cros_feature_to_cells cros_subdevices[] = { .mfd_cells = cros_ec_rtc_cells, .num_cells = ARRAY_SIZE(cros_ec_rtc_cells), }, - { - .id = EC_FEATURE_UCSI_PPM, - .mfd_cells = cros_ec_ucsi_cells, - .num_cells = ARRAY_SIZE(cros_ec_ucsi_cells), - }, { .id = EC_FEATURE_HANG_DETECT, .mfd_cells = cros_ec_wdt_cells, @@ -169,6 +165,15 @@ static const struct mfd_cell cros_ec_vbc_cells[] = { { .name = "cros-ec-vbc", } }; + +static int ucsi_acpi_match(struct device *dev, void *data) +{ + struct acpi_device_id ucsi_acpi_device_ids[] = { + { "GOOG0021", 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)); @@ -256,6 +261,30 @@ static int ec_device_probe(struct platform_device *pdev) } } + /* + * 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 = 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 = 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.