PCI/pwrctrl: generic: Rename pci-pwrctrl-slot as generic

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 <mani@kernel.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Link: https://patch.msgid.link/20260220-topic-sm8650-ayaneo-pocket-s2-base-v5-3-1ad79caa1efa@linaro.org

diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index d0aa031397fab1451b33aa3d6f2749de3ee05df4..4bd36e133ca647e62da599dbb74961cb4a42c884 100644 (file)
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -309,7 +309,7 @@ config PCIE_QCOM
        select CRC8
        select PCIE_QCOM_COMMON
        select PCI_HOST_COMMON
-       select PCI_PWRCTRL_SLOT
+       select PCI_PWRCTRL_GENERIC
        help
          Say Y here to enable PCIe controller support on Qualcomm SoCs. The
          PCIe controller uses the DesignWare core plus Qualcomm-specific
@@ -431,7 +431,7 @@ config PCIE_SPACEMIT_K1
        depends on ARCH_SPACEMIT || COMPILE_TEST
        depends on HAS_IOMEM
        select PCIE_DW_HOST
-       select PCI_PWRCTRL_SLOT
+       select PCI_PWRCTRL_GENERIC
        default ARCH_SPACEMIT
        help
          Enables support for the DesignWare based PCIe controller in

diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
index cd3aa15bad009cf759140b4fddf369bddcbc4ac4..9eec767cda86e229dea042ba765b03386f44ba98 100644 (file)
--- a/drivers/pci/pwrctrl/Kconfig
+++ b/drivers/pci/pwrctrl/Kconfig
@@ -11,17 +11,18 @@ config PCI_PWRCTRL_PWRSEQ
        select POWER_SEQUENCING
        select PCI_PWRCTRL
 
-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 POWER_SEQUENCING
        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.
 
          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 or endpoint.
 
 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 13b02282106c2bdbf884f487534f7466047c7fcf..f6bb4fb9a410b0a1f795d9953063808f85d84663 100644 (file)
--- a/drivers/pci/pwrctrl/Makefile
+++ b/drivers/pci/pwrctrl/Makefile
@@ -5,7 +5,7 @@ pci-pwrctrl-core-y                      := core.o
 
 obj-$(CONFIG_PCI_PWRCTRL_PWRSEQ)       += pci-pwrctrl-pwrseq.o
 
-obj-$(CONFIG_PCI_PWRCTRL_SLOT)         += pci-pwrctrl-slot.o
-pci-pwrctrl-slot-y                     := slot.o
+obj-$(CONFIG_PCI_PWRCTRL_GENERIC)      += pci-pwrctrl-generic.o
+pci-pwrctrl-generic-y                  := generic.o
 
 obj-$(CONFIG_PCI_PWRCTRL_TC9563)       += pci-pwrctrl-tc9563.o

diff --git a/drivers/pci/pwrctrl/slot.c b/drivers/pci/pwrctrl/generic.c
similarity index 100%
rename from drivers/pci/pwrctrl/slot.c
rename to drivers/pci/pwrctrl/generic.c