Series comparison

-[PATCH 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols
+[PATCH v2 0/4] PCI/arm64/ath11k/ath12k: Rename pwrctrl Kconfig symbols
 ...
 This leads to people not knowing how to refer to the framework in
 writing, inconsistencies in module naming, etc.
 Let's rename also the Kconfig symbols before this gets any worse.
-The arm64, ath11k and ath12k changes could go through the corresponding
+The ath11k, ath12k and arm64 changes could go theoretically go through
-subsystem trees once they have the new symbols (e.g. in the next cycle)
+the corresponding subsystem trees in turn once they have the new
-or they could all go in via the PCI tree with an ack from their
+symbols, but to avoid tracking dependencies over multiple cycles it is
-maintainers.
+much preferred to have all of these go in through the PCI tree.
 The wifi patches have been acked by Jeff and I don't think Will or
 Catalin will mind the single rename in arm64 if they don't see this
 message in time.
 Note that the patches could be squashed into one, but keeping them
 separate highlights the changes done to other subsystems. I also find it
 easier to review the changes this way.
 There are some new pwrctrl drivers and an arm64 defconfig change on the
-lists so we may need to keep deprecated symbols for a release or two.
+lists, but the former should also go in through PCI anyway while we can
 make sure that the defconfig update matches the new slot symbol.
 Note that getting this rename into rc1 would be great as that way it
 would end up in most subsystem trees soon as well.
 Johan
+Changes in v2:
+ - drop deprecated symbol for the new slot driver to avoid having to a
+   add a new user visible symbol (e.g. any early adopters will be asked
+   to enable the renamed option again)
+ - move arm64 patch last two avoid temporarily not having the pwrseq
+   driver selected (Jonas)
 Johan Hovold (4):
   PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
-  arm64: Kconfig: switch to HAVE_PWRCTRL
   wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
   wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
+  arm64: Kconfig: switch to HAVE_PWRCTRL
  arch/arm64/Kconfig.platforms            |  2 +-
  drivers/net/wireless/ath/ath11k/Kconfig |  2 +-
  drivers/net/wireless/ath/ath12k/Kconfig |  2 +-
- drivers/pci/pwrctrl/Kconfig             | 27 +++++++++++++++++++------
+ drivers/pci/pwrctrl/Kconfig             | 22 ++++++++++++++++------
  drivers/pci/pwrctrl/Makefile            |  8 ++++----
-files changed, 28 insertions(+), 13 deletions(-)
+files changed, 23 insertions(+), 13 deletions(-)
 --
-.48.1
+.49.0

-[PATCH 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
+[PATCH v2 1/4] PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
 ...
 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.
 The new slot module is also renamed to reflect the framework name and
 match the other pwrctrl modules.
+Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
 ---
- drivers/pci/pwrctrl/Kconfig  | 27 +++++++++++++++++++++------
+ drivers/pci/pwrctrl/Kconfig  | 22 ++++++++++++++++------
  drivers/pci/pwrctrl/Makefile |  8 ++++----
-files changed, 25 insertions(+), 10 deletions(-)
+files changed, 20 insertions(+), 10 deletions(-)
 diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/pci/pwrctrl/Kconfig
 +++ b/drivers/pci/pwrctrl/Kconfig
 ...
 +
 +# deprecated
 +config PCI_PWRCTL_PWRSEQ
 +    tristate
 +    select PCI_PWRCTRL_PWRSEQ
-+
-+# deprecated
-+config PCI_PWRCTL_SLOT
-+    tristate
-+    select PCI_PWRCTRL_SLOT
 diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/pci/pwrctrl/Makefile
 +++ b/drivers/pci/pwrctrl/Makefile
 @@ -XXX,XX +XXX,XX @@
 ...
 -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
 --
-.48.1
+.49.0

-[PATCH 3/4] wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
+[PATCH v2 2/4] wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
 The PCI_PWRCTRL_PWRSEQ and HAVE_PWRCTRL symbols have been renamed to
 reflect the pwrctrl framework name. Switch to the non-deprecated
 symbols.
+Acked-by: Jeff Johnson <jjohnson@kernel.org> # drivers/net/wireless/ath/...
+Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
 ---
  drivers/net/wireless/ath/ath11k/Kconfig | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
 ...
 +    select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL
      help
        This module adds support for PCIE bus
 --
-.48.1
+.49.0

-[PATCH 4/4] wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
+[PATCH v2 3/4] wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
 The PCI_PWRCTRL_PWRSEQ and HAVE_PWRCTRL symbols have been renamed to
 reflect the pwrctrl framework name. Switch to the non-deprecated
 symbols.
+Acked-by: Jeff Johnson <jjohnson@kernel.org> # drivers/net/wireless/ath/...
+Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
 ---
  drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
 ...
 +    select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL
      help
        Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE
 .11be) family of chipsets, for example WCN7850 and
 --
-.48.1
+.49.0

-[PATCH 2/4] arm64: Kconfig: switch to HAVE_PWRCTRL
+[PATCH v2 4/4] arm64: Kconfig: switch to HAVE_PWRCTRL
 ...
 +    select HAVE_PWRCTRL if PCI
      help
        This enables support for the ARMv8 based Qualcomm chipsets.
 --
-.48.1
+.49.0

The PCI pwrctrl framework was renamed after being merged, but the
Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in
writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

The arm64, ath11k and ath12k changes could go through the corresponding
subsystem trees once they have the new symbols (e.g. in the next cycle)
or they could all go in via the PCI tree with an ack from their
maintainers.

There are some new pwrctrl drivers and an arm64 defconfig change on the
lists so we may need to keep deprecated symbols for a release or two.

Johan

Johan Hovold (4):
  PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
  arm64: Kconfig: switch to HAVE_PWRCTRL
  wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
  wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ

arch/arm64/Kconfig.platforms            |  2 +-
 drivers/net/wireless/ath/ath11k/Kconfig |  2 +-
 drivers/net/wireless/ath/ath12k/Kconfig |  2 +-
 drivers/pci/pwrctrl/Kconfig             | 27 +++++++++++++++++++------
 drivers/pci/pwrctrl/Makefile            |  8 ++++----
 5 files changed, 28 insertions(+), 13 deletions(-)

-- 
2.48.1

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.

The new slot module is also renamed to reflect the framework name and
match the other pwrctrl modules.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/pci/pwrctrl/Kconfig  | 27 +++++++++++++++++++++------
 drivers/pci/pwrctrl/Makefile |  8 ++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/drivers/pci/pwrctrl/Kconfig
+++ b/drivers/pci/pwrctrl/Kconfig
@@ -XXX,XX +XXX,XX @@
 # 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.
@@ -XXX,XX +XXX,XX @@ 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
+
+# deprecated
+config PCI_PWRCTL_SLOT
+	tristate
+	select PCI_PWRCTRL_SLOT
diff --git a/drivers/pci/pwrctrl/Makefile b/drivers/pci/pwrctrl/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/drivers/pci/pwrctrl/Makefile
+++ b/drivers/pci/pwrctrl/Makefile
@@ -XXX,XX +XXX,XX @@
 # 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
-- 
2.48.1

The PCI pwrctrl framework was renamed after being merged, but the
Kconfig symbols still reflect the old name ("pwrctl" without an "r").

This leads to people not knowing how to refer to the framework in
writing, inconsistencies in module naming, etc.

Let's rename also the Kconfig symbols before this gets any worse.

The ath11k, ath12k and arm64 changes could go theoretically go through
the corresponding subsystem trees in turn once they have the new
symbols, but to avoid tracking dependencies over multiple cycles it is
much preferred to have all of these go in through the PCI tree.

The wifi patches have been acked by Jeff and I don't think Will or
Catalin will mind the single rename in arm64 if they don't see this
message in time.

Note that the patches could be squashed into one, but keeping them
separate highlights the changes done to other subsystems. I also find it
easier to review the changes this way.

There are some new pwrctrl drivers and an arm64 defconfig change on the
lists, but the former should also go in through PCI anyway while we can
make sure that the defconfig update matches the new slot symbol.

Note that getting this rename into rc1 would be great as that way it
would end up in most subsystem trees soon as well.

Johan

Changes in v2:
 - drop deprecated symbol for the new slot driver to avoid having to a
   add a new user visible symbol (e.g. any early adopters will be asked
   to enable the renamed option again)

- move arm64 patch last two avoid temporarily not having the pwrseq
   driver selected (Jonas)

Johan Hovold (4):
  PCI/pwrctrl: Rename pwrctrl Kconfig symbols and slot module
  wifi: ath11k: switch to PCI_PWRCTRL_PWRSEQ
  wifi: ath12k: switch to PCI_PWRCTRL_PWRSEQ
  arm64: Kconfig: switch to HAVE_PWRCTRL

arch/arm64/Kconfig.platforms            |  2 +-
 drivers/net/wireless/ath/ath11k/Kconfig |  2 +-
 drivers/net/wireless/ath/ath12k/Kconfig |  2 +-
 drivers/pci/pwrctrl/Kconfig             | 22 ++++++++++++++++------
 drivers/pci/pwrctrl/Makefile            |  8 ++++----
 5 files changed, 23 insertions(+), 13 deletions(-)

-- 
2.49.0

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.

The new slot module is also renamed to reflect the framework name and
match the other pwrctrl modules.

Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/pci/pwrctrl/Kconfig  | 22 ++++++++++++++++------
 drivers/pci/pwrctrl/Makefile |  8 ++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/pwrctrl/Kconfig b/drivers/pci/pwrctrl/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/drivers/pci/pwrctrl/Kconfig
+++ b/drivers/pci/pwrctrl/Kconfig
@@ -XXX,XX +XXX,XX @@
 # 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.
@@ -XXX,XX +XXX,XX @@ 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 XXXXXXX..XXXXXXX 100644
--- a/drivers/pci/pwrctrl/Makefile
+++ b/drivers/pci/pwrctrl/Makefile
@@ -XXX,XX +XXX,XX @@
 # 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
-- 
2.49.0

The PCI_PWRCTRL_PWRSEQ and HAVE_PWRCTRL symbols have been renamed to
reflect the pwrctrl framework name. Switch to the non-deprecated
symbols.

Acked-by: Jeff Johnson <jjohnson@kernel.org> # drivers/net/wireless/ath/...
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/net/wireless/ath/ath12k/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath12k/Kconfig b/drivers/net/wireless/ath/ath12k/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/drivers/net/wireless/ath/ath12k/Kconfig
+++ b/drivers/net/wireless/ath/ath12k/Kconfig
@@ -XXX,XX +XXX,XX @@ config ATH12K
 	select MHI_BUS
 	select QRTR
 	select QRTR_MHI
-	select PCI_PWRCTL_PWRSEQ if HAVE_PWRCTL
+	select PCI_PWRCTRL_PWRSEQ if HAVE_PWRCTRL
 	help
 	  Enable support for Qualcomm Technologies Wi-Fi 7 (IEEE
 	  802.11be) family of chipsets, for example WCN7850 and
-- 
2.49.0