From nobody Fri Apr 3 03:17:28 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 DAAD2312821 for ; Mon, 16 Feb 2026 14:21:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771251719; cv=none; b=Bcpr0icKFFjSUb7OD66jYc9igGu0rnelegeUAnGq6Pl9V6MZ685MO6QsRleRscYtjXr0AsQegea6xuqfEvPzcgZYJqbNEjDgT2qmwEVSiDt5O05Nlcn+7VS8lVBJ/nGG7hf38VJ3U8o+QTKQCg/7kAh7fIVgquJDo8wwO8kvpHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771251719; c=relaxed/simple; bh=e+EkWC2n4pNM3k4t8mwvlHMc2Vj8SO/DiCWja7TtWYg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s/xbaq+wUvwp9Rc+PHIgjWlwTOMwkbpNMjHIHT8RAwaDowdDrka6Cy2KpG6XcNfAxaYVt5lrFFamCyuOL6Zfz/TtJxQ7TgPmJSh1K/XLj7VnhY9dqsY72IuB7kdhmB99rXB3tAlWpHeKA52OtuxxMSiVp+s83so0rjIx+7qx540= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=pTi/WSEb; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pTi/WSEb" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-48375f1defeso24874395e9.0 for ; Mon, 16 Feb 2026 06:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771251715; x=1771856515; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=f/9SQvmpy9H4vWRy3pZsPCqXW6+l8s5UosjKXnI3KRs=; b=pTi/WSEbIr6iZRdp9FST+wYVLFL9Ij28eLCNe9r0tdS1j8SP0WxCuMl2BZeEkkkMRm CUAeDuPSbGed/2E6DVGn0Bmja3Uu+/SHHZA/Vz0g7rgNZdwZXdYicu3imw8h5IJOAzj/ xBNKjleiUakqR78ze+8TD74ohODozZ1PQUc7S7/Wo5HUVjehf8H3JABKFwR9KSsdGJ/1 AoWi7sUrKik6AgrYlIW5N7I/qNz06dfS2r4K6Ui22ASWHBNV/On1RWJM0r9erxj6IHFA V2p2xhO+LsF10hc9VL9WtzF/VOEQjjL8HKMoG95X/9v3b7SVGNcshNN3vTDiQ6Wxw+kC Cp3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771251715; x=1771856515; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=f/9SQvmpy9H4vWRy3pZsPCqXW6+l8s5UosjKXnI3KRs=; b=LgD4tshVGwObzpuhEl0IWxN424ocDmNOB3BHf+gFiq7jeGMFodV82mE4wmaIrKZCja c7+Duk1OMLqw+pL6KcgwQHndUJfGmhjinij3MhSkwoDAEHweywj0Pkc+uoQJapXp/4Jj gWOedkvyzKfJvrn1atkEmoQSgEmCV1pzhbrKAqLyGQfLazq7oGgGhyqIDH6oFrKFUt0P Xn/ZkNXeOOUDNm5vbMzKhfhWw6eSSbtM6PuC42sYJFOzMHzBfzvmw8gFt+2fmpmnrfDL cFK3Xi+5JpibQYspP8SjOTWw79rtRXk/nfDMEZnYftHFEcLZm8HFgZRff0Rgd5T/rFNM JVPg== X-Forwarded-Encrypted: i=1; AJvYcCV/x7rX2NJFN399bn4Gk5lb8zPqrvBdm5lBlpCYc448bvQIMtoGOtsNGkLrr2suoeXbnFYdbqGyOJVPNxA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+AuWdinew5G6frIrLS0AHaabwZ6nYpxtd4yOj9ohgAaZZjplY tCN6YcCEQnuhdiu7ogVATRli7VuDFkJfY4BXBJhgFiroUGsXKiNCWgDwfC9wMXxayWs= X-Gm-Gg: AZuq6aLGbruFvF/oxYgHY0MuJ1ep5NZclI/Dpxw2+Q5KPoH3adiSwafnl7wEHJdy7bE JI8Lm8Ca7frUgj0vovZXRSUU/N4RdkvZk52vsgCHXCBomXHlOwXD9kWuh2aZYHR5veQyykh9a8Y vTrA1vYmHlQp+l1driORQ9xxtGrVTVCsH1mGpwBqFVqr1LYPEd4lZSjFI1Ex5KUo5dNGzRCzYEr tP/QaESTYJzU/2fYVCexzZqEMYwhq+hKenmlO5eRonfy5+6OC33NynlNowiE2yv4C7lL2Inbcb0 sS5j3dsTDENbYhesGwVjUjnNIpGoFoJ7eCahjFUJW0WZpQFEVLnuusWEO7acOPM3hPUoszx/3M8 4wusKrB4Y5r8aq17z9lpbkFA053XOmpb0B7jmRmDj2APfv3Qrqc+2d3setvSuk29fnpdjJ8TA1a XLcZds9wM2fizRMlG+UjJ9ACzHgt34+6mCRSpYkIuwlrBfeDByTwf6GGY= X-Received: by 2002:a05:600c:6206:b0:477:76c2:49c9 with SMTP id 5b1f17b1804b1-48373a0842fmr151498205e9.2.1771251715087; Mon, 16 Feb 2026 06:21:55 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:106d:1080:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48370a63afesm86717475e9.9.2026.02.16.06.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 06:21:54 -0800 (PST) From: Neil Armstrong Date: Mon, 16 Feb 2026 15:21:47 +0100 Subject: [PATCH v4 3/9] pci: pwrctrl: rename pci-pwrctrl-slot as generic Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260216-topic-sm8650-ayaneo-pocket-s2-base-v4-3-802c82795431@linaro.org> References: <20260216-topic-sm8650-ayaneo-pocket-s2-base-v4-0-802c82795431@linaro.org> In-Reply-To: <20260216-topic-sm8650-ayaneo-pocket-s2-base-v4-0-802c82795431@linaro.org> To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Bartosz Golaszewski , Manivannan Sadhasivam , Bjorn Helgaas , Bjorn Andersson , Konrad Dybcio Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8065; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=e+EkWC2n4pNM3k4t8mwvlHMc2Vj8SO/DiCWja7TtWYg=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBpkyf7fyk4ar/een2ppTz2YyuSmnqLKeArdKG+TMgw zqVdnQmJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCaZMn+wAKCRB33NvayMhJ0deeD/ wJnFTpLZmDCw9qKPW+jgW/zNUnvsE8dTJVgiNjPZQsOlGCuIkw9HhkdRlfM22TNC2BHmXEIktlAash bpNCZhVVmLGWVOg8BllIr1JlAZU7ZO96AindbWuzw2xXnMU/s/sfJHm8Bt/CwDSvFh8L1t2ksUyl8n VZK69EeFXHS4HQwpIipTSFJ/DeUVliqq/TUrKCrMi9XtvDJHW7RHoaJinoAQ3Z8InHSlzdCVsGjOMC sPn36JTwPTd0iX7r02vUuZlqczLxMR+NC3Q/qjEZbMU0nTGYSLueW1Q2UvB7nfXqfFj8ujyHbkeFlm 1FQyHuBiaod6JCldxBs5XZQghb7VzgqXdP69A20i/vEm/+TM76QlAJ8RdU/uI9P0/h30980ctGZ8I+ wNvrDveS8LH47jwLZ7jPQ3TMqKovfWVT9Hb4L/IXObvNU0+5D4b+UHXPnugxRJVfRpEyypiYMZ388j tLH8AmRCaqRKiJ67mzLndw9JJONWejhHwvY60CXU7E/yn5xCGKWT8hwh/Llq6v6DCU0mj0lfEe0POp 8xZPkZI3TGX+lQwNMyXb+xxaHxmdd8GrVkycDvIf4akcrhF5LKwDEuBz94h4jXf+7u3F/Q3LMn+iIT St0nl7coBNxVw4xyUuQIq2+QC/B3BK6gElom6O1I/rBLBbQZVtMvkSE5YEQw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE The driver is pretty generic and would fit for either PCI Slots or endpoints connected to PCI ports, so rename the driver and module as pci-pwrctrl-generic. Suggested-by: Manivannan Sadhasivam Signed-off-by: Neil Armstrong --- drivers/pci/pwrctrl/Kconfig | 13 ++++--- drivers/pci/pwrctrl/Makefile | 4 +- drivers/pci/pwrctrl/generic.c | 91 +++++++++++++++++++++++++++++++++++++++= ++++ drivers/pci/pwrctrl/slot.c | 91 ---------------------------------------= ---- 4 files changed, 100 insertions(+), 99 deletions(-) diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig index e0f999f299bb..0ba095729694 100644 --- a/drivers/pci/pwrctrl/Kconfig +++ b/drivers/pci/pwrctrl/Kconfig @@ -11,16 +11,17 @@ config PCI_PWRCTRL_PWRSEQ select POWER_SEQUENCING select PCI_PWRCTRL =20 -config PCI_PWRCTRL_SLOT - tristate "PCI Power Control driver for PCI slots" +config PCI_PWRCTRL_GENERIC + tristate "Generic PCI Power Control driver for PCI slots and endpoints" select PCI_PWRCTRL help - Say Y here to enable the PCI Power Control driver to control the power - state of PCI slots. + Say Y here to enable the generic PCI Power Control driver to control + the power state of PCI slots and endpoints. =20 This is a generic driver that controls the power state of different - PCI slots. The voltage regulators powering the rails of the PCI slots - are expected to be defined in the devicetree node of the PCI bridge. + PCI slots and endpoints. The voltage regulators powering the rails + of the PCI slots or endpoints are expected to be defined in the + devicetree node of the PCI bridge. =20 config PCI_PWRCTRL_TC9563 tristate "PCI Power Control driver for TC9563 PCIe switch" diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile index 13b02282106c..f6bb4fb9a410 100644 --- a/drivers/pci/pwrctrl/Makefile +++ b/drivers/pci/pwrctrl/Makefile @@ -5,7 +5,7 @@ pci-pwrctrl-core-y :=3D core.o =20 obj-$(CONFIG_PCI_PWRCTRL_PWRSEQ) +=3D pci-pwrctrl-pwrseq.o =20 -obj-$(CONFIG_PCI_PWRCTRL_SLOT) +=3D pci-pwrctrl-slot.o -pci-pwrctrl-slot-y :=3D slot.o +obj-$(CONFIG_PCI_PWRCTRL_GENERIC) +=3D pci-pwrctrl-generic.o +pci-pwrctrl-generic-y :=3D generic.o =20 obj-$(CONFIG_PCI_PWRCTRL_TC9563) +=3D pci-pwrctrl-tc9563.o diff --git a/drivers/pci/pwrctrl/generic.c b/drivers/pci/pwrctrl/generic.c new file mode 100644 index 000000000000..a5b7b7965f46 --- /dev/null +++ b/drivers/pci/pwrctrl/generic.c @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024 Linaro Ltd. + * Author: Manivannan Sadhasivam + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct pci_pwrctrl_generic_data { + struct pci_pwrctrl ctx; + struct regulator_bulk_data *supplies; + int num_supplies; +}; + +static void devm_pci_pwrctrl_generic_power_off(void *data) +{ + struct pci_pwrctrl_generic_data *generic =3D data; + + regulator_bulk_disable(generic->num_supplies, generic->supplies); + regulator_bulk_free(generic->num_supplies, generic->supplies); +} + +static int pci_pwrctrl_generic_probe(struct platform_device *pdev) +{ + struct pci_pwrctrl_generic_data *generic; + struct device *dev =3D &pdev->dev; + struct clk *clk; + int ret; + + generic =3D devm_kzalloc(dev, sizeof(*generic), GFP_KERNEL); + if (!generic) + return -ENOMEM; + + ret =3D of_regulator_bulk_get_all(dev, dev_of_node(dev), + &generic->supplies); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get regulators\n"); + + generic->num_supplies =3D ret; + ret =3D regulator_bulk_enable(generic->num_supplies, generic->supplies); + if (ret < 0) { + regulator_bulk_free(generic->num_supplies, generic->supplies); + return dev_err_probe(dev, ret, "Failed to enable regulators\n"); + } + + ret =3D devm_add_action_or_reset(dev, devm_pci_pwrctrl_generic_power_off, + generic); + if (ret) + return ret; + + clk =3D devm_clk_get_optional_enabled(dev, NULL); + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), + "Failed to enable clock\n"); + + pci_pwrctrl_init(&generic->ctx, dev); + + ret =3D devm_pci_pwrctrl_device_set_ready(dev, &generic->ctx); + if (ret) + return dev_err_probe(dev, ret, "Failed to register generic pwrctrl drive= r\n"); + + return 0; +} + +static const struct of_device_id pci_pwrctrl_generic_of_match[] =3D { + { + .compatible =3D "pciclass,0604", + }, + { } +}; +MODULE_DEVICE_TABLE(of, pci_pwrctrl_generic_of_match); + +static struct platform_driver pci_pwrctrl_generic_driver =3D { + .driver =3D { + .name =3D "pci-pwrctrl-generic", + .of_match_table =3D pci_pwrctrl_generic_of_match, + }, + .probe =3D pci_pwrctrl_generic_probe, +}; +module_platform_driver(pci_pwrctrl_generic_driver); + +MODULE_AUTHOR("Manivannan Sadhasivam "); +MODULE_DESCRIPTION("Generic PCI Power Control driver for PCI Slots"); +MODULE_LICENSE("GPL"); diff --git a/drivers/pci/pwrctrl/slot.c b/drivers/pci/pwrctrl/slot.c deleted file mode 100644 index 08e53243cdbd..000000000000 --- a/drivers/pci/pwrctrl/slot.c +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2024 Linaro Ltd. - * Author: Manivannan Sadhasivam - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -struct pci_pwrctrl_slot_data { - struct pci_pwrctrl ctx; - struct regulator_bulk_data *supplies; - int num_supplies; -}; - -static void devm_pci_pwrctrl_slot_power_off(void *data) -{ - struct pci_pwrctrl_slot_data *slot =3D data; - - regulator_bulk_disable(slot->num_supplies, slot->supplies); - regulator_bulk_free(slot->num_supplies, slot->supplies); -} - -static int pci_pwrctrl_slot_probe(struct platform_device *pdev) -{ - struct pci_pwrctrl_slot_data *slot; - struct device *dev =3D &pdev->dev; - struct clk *clk; - int ret; - - slot =3D devm_kzalloc(dev, sizeof(*slot), GFP_KERNEL); - if (!slot) - return -ENOMEM; - - ret =3D of_regulator_bulk_get_all(dev, dev_of_node(dev), - &slot->supplies); - if (ret < 0) - return dev_err_probe(dev, ret, "Failed to get slot regulators\n"); - - slot->num_supplies =3D ret; - ret =3D regulator_bulk_enable(slot->num_supplies, slot->supplies); - if (ret < 0) { - regulator_bulk_free(slot->num_supplies, slot->supplies); - return dev_err_probe(dev, ret, "Failed to enable slot regulators\n"); - } - - ret =3D devm_add_action_or_reset(dev, devm_pci_pwrctrl_slot_power_off, - slot); - if (ret) - return ret; - - clk =3D devm_clk_get_optional_enabled(dev, NULL); - if (IS_ERR(clk)) - return dev_err_probe(dev, PTR_ERR(clk), - "Failed to enable slot clock\n"); - - pci_pwrctrl_init(&slot->ctx, dev); - - ret =3D devm_pci_pwrctrl_device_set_ready(dev, &slot->ctx); - if (ret) - return dev_err_probe(dev, ret, "Failed to register pwrctrl driver\n"); - - return 0; -} - -static const struct of_device_id pci_pwrctrl_slot_of_match[] =3D { - { - .compatible =3D "pciclass,0604", - }, - { } -}; -MODULE_DEVICE_TABLE(of, pci_pwrctrl_slot_of_match); - -static struct platform_driver pci_pwrctrl_slot_driver =3D { - .driver =3D { - .name =3D "pci-pwrctrl-slot", - .of_match_table =3D pci_pwrctrl_slot_of_match, - }, - .probe =3D pci_pwrctrl_slot_probe, -}; -module_platform_driver(pci_pwrctrl_slot_driver); - -MODULE_AUTHOR("Manivannan Sadhasivam "); -MODULE_DESCRIPTION("Generic PCI Power Control driver for PCI Slots"); -MODULE_LICENSE("GPL"); --=20 2.34.1