PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module

Commits b88cbaaa6fa1 ("PCI/pwrctrl: Rename pwrctl files to pwrctrl") and
3f925cd62874 ("PCI/pwrctrl: Rename pwrctrl functions and structures")
renamed the "pwrctl" framework to "pwrctrl" for consistency reasons.

Rename also the Kconfig symbols so that they reflect the new name while
adding entries for the deprecated ones. The old symbols can be removed once
everything that depends on them has been updated.

Note that no deprecated symbol is added for the new slot driver to avoid
having to add a user visible option.

Rename the new slot module to reflect the framework name and match the
other pwrctrl modules.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://patch.msgid.link/20250402132634.18065-2-johan+linaro@kernel.org

diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
index 990cab67d41332a8508d4150825c621eb86322c5..6956c18548114ce12247b560f1ef159eb7e90b10 100644 (file)
--- a/drivers/pci/pwrctrl/Kconfig
+++ b/drivers/pci/pwrctrl/Kconfig
@@ -1,19 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-config HAVE_PWRCTL
+config HAVE_PWRCTRL
        bool
 
-config PCI_PWRCTL
+config PCI_PWRCTRL
        tristate
 
-config PCI_PWRCTL_PWRSEQ
+config PCI_PWRCTRL_PWRSEQ
        tristate
        select POWER_SEQUENCING
-       select PCI_PWRCTL
+       select PCI_PWRCTRL
 
-config PCI_PWRCTL_SLOT
+config PCI_PWRCTRL_SLOT
        tristate "PCI Power Control driver for PCI slots"
-       select PCI_PWRCTL
+       select PCI_PWRCTRL
        help
          Say Y here to enable the PCI Power Control driver to control the power
          state of PCI slots.
@@ -21,3 +21,13 @@ config PCI_PWRCTL_SLOT
          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.
+
+# deprecated
+config HAVE_PWRCTL
+       bool
+       select HAVE_PWRCTRL
+
+# deprecated
+config PCI_PWRCTL_PWRSEQ
+       tristate
+       select PCI_PWRCTRL_PWRSEQ

diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile
index ddfb12c5aadf684cf675585b1078ecb7c24649cc..a4e5808d7850ceb0ca272731e5539e1dfc564e43 100644 (file)
--- a/drivers/pci/pwrctrl/Makefile
+++ b/drivers/pci/pwrctrl/Makefile
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-obj-$(CONFIG_PCI_PWRCTL)               += pci-pwrctrl-core.o
+obj-$(CONFIG_PCI_PWRCTRL)              += pci-pwrctrl-core.o
 pci-pwrctrl-core-y                     := core.o
 
-obj-$(CONFIG_PCI_PWRCTL_PWRSEQ)                += pci-pwrctrl-pwrseq.o
+obj-$(CONFIG_PCI_PWRCTRL_PWRSEQ)       += pci-pwrctrl-pwrseq.o
 
-obj-$(CONFIG_PCI_PWRCTL_SLOT)          += pci-pwrctl-slot.o
-pci-pwrctl-slot-y                      := slot.o
+obj-$(CONFIG_PCI_PWRCTRL_SLOT)         += pci-pwrctrl-slot.o
+pci-pwrctrl-slot-y                     := slot.o