[PATCH 0/1] platform/x86: Drop the PMC_ATOM Kconfig option

[PATCH 0/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Hans de Goede]

Hi All,

Here is a patch resulting from an earlier series from Paul Gortmaker to
allow disabling building the PMC_ATOM bits on platforms which don't
need them:
https://lore.kernel.org/platform-driver-x86/20220428062430.31010-1-paul.gortmaker@windriver.com/

This is a simpler way to achieve the result, while actually simplifying
things / removing some code.

Stephen, if you are ok with this change can you give your Acked-by for
merging this through the pdx86 tree ?

Regards,

Hans


Hans de Goede (1):
  platform/x86: Drop the PMC_ATOM Kconfig option

 drivers/clk/x86/Makefile      | 4 +---
 drivers/platform/x86/Kconfig  | 5 -----
 drivers/platform/x86/Makefile | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

-- 
2.36.0

[PATCH 1/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Hans de Goede]

The def_bool y PMC_ATOM Kconfig option provides a couple of symbols used
by the code enabled by the X86_INTEL_LPSS option and it registers some
clocks. These clocks are only registered on Bay Trail, Cherry Trail and
Brasswell Intel SoCs and kernels targeting these SoCs must always have
the X86_INTEL_LPSS option enabled otherwise many things will not work.

Building the PMC_ATOM code on kernels which are not targeting the
mentioned SoCs and which do not have the X86_INTEL_LPSS enabled is
not useful.

This means that we can simplify things by replacing the PMC_ATOM Kconfig
option in Makefiles with X86_INTEL_LPSS and then drop the option.

Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/clk/x86/Makefile      | 4 +---
 drivers/platform/x86/Kconfig  | 5 -----
 drivers/platform/x86/Makefile | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
index 1244c4e568ff..c2088b3c4081 100644
--- a/drivers/clk/x86/Makefile
+++ b/drivers/clk/x86/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_PMC_ATOM)		+= clk-pmc-atom.o
 obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE)	+= clk-fch.o
-clk-x86-lpss-y			:= clk-lpss-atom.o
-obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-x86-lpss.o
+obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-lpss-atom.o clk-pmc-atom.o
 obj-$(CONFIG_CLK_LGM_CGU)	+= clk-cgu.o clk-cgu-pll.o clk-lgm.o
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f08ad85683cb..85c396a43048 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1161,8 +1161,3 @@ config WINMATE_FM07_KEYS
 	  that delivers key events when these buttons are pressed.
 
 endif # X86_PLATFORM_DEVICES
-
-config PMC_ATOM
-       def_bool y
-       depends on PCI
-       select COMMON_CLK
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4a59f47a46e2..cc2a74713313 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -126,7 +126,7 @@ obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
 obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
 obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
-obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
+obj-$(CONFIG_X86_INTEL_LPSS)		+= pmc_atom.o
 
 # Siemens Simatic Industrial PCs
 obj-$(CONFIG_SIEMENS_SIMATIC_IPC)	+= simatic-ipc.o
-- 
2.36.0

Re: [PATCH 1/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Stephen Boyd]

Quoting Hans de Goede (2022-05-03 04:46:07)
> The def_bool y PMC_ATOM Kconfig option provides a couple of symbols used
> by the code enabled by the X86_INTEL_LPSS option and it registers some
> clocks. These clocks are only registered on Bay Trail, Cherry Trail and
> Brasswell Intel SoCs and kernels targeting these SoCs must always have
> the X86_INTEL_LPSS option enabled otherwise many things will not work.
> 
> Building the PMC_ATOM code on kernels which are not targeting the
> mentioned SoCs and which do not have the X86_INTEL_LPSS enabled is
> not useful.
> 
> This means that we can simplify things by replacing the PMC_ATOM Kconfig
> option in Makefiles with X86_INTEL_LPSS and then drop the option.
> 
> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 1/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Hans de Goede]

Hi,

On 5/18/22 23:00, Stephen Boyd wrote:
> Quoting Hans de Goede (2022-05-03 04:46:07)
>> The def_bool y PMC_ATOM Kconfig option provides a couple of symbols used
>> by the code enabled by the X86_INTEL_LPSS option and it registers some
>> clocks. These clocks are only registered on Bay Trail, Cherry Trail and
>> Brasswell Intel SoCs and kernels targeting these SoCs must always have
>> the X86_INTEL_LPSS option enabled otherwise many things will not work.
>>
>> Building the PMC_ATOM code on kernels which are not targeting the
>> mentioned SoCs and which do not have the X86_INTEL_LPSS enabled is
>> not useful.
>>
>> This means that we can simplify things by replacing the PMC_ATOM Kconfig
>> option in Makefiles with X86_INTEL_LPSS and then drop the option.
>>
>> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
> 
> Acked-by: Stephen Boyd <sboyd@kernel.org>

Thanks.

I've added this to my review-hans (soon to be for-next) branch now.

Regards,

Hans

[PATCH 0/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Hans de Goede]

Hi All,

Here is a patch resulting from an earlier series from Paul Gortmaker to
allow disabling building the PMC_ATOM bits on platforms which don't
need them:
https://lore.kernel.org/platform-driver-x86/20220428062430.31010-1-paul.gortmaker@windriver.com/

This is a simpler way to achieve the result, while actually simplifying
things / removing some code.

Stephen, if you are ok with this change can you give your Acked-by for
merging this through the pdx86 tree ?

Regards,

Hans


Hans de Goede (1):
  platform/x86: Drop the PMC_ATOM Kconfig option

 drivers/clk/x86/Makefile      | 4 +---
 drivers/platform/x86/Kconfig  | 5 -----
 drivers/platform/x86/Makefile | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

-- 
2.36.0

[PATCH 1/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Hans de Goede]

The def_bool y PMC_ATOM Kconfig option provides a couple of symbols used
by the code enabled by the X86_INTEL_LPSS option and it registers some
clocks. These clocks are only registered on Bay Trail, Cherry Trail and
Brasswell Intel SoCs and kernels targeting these SoCs must always have
the X86_INTEL_LPSS option enabled otherwise many things will not work.

Building the PMC_ATOM code on kernels which are not targeting the
mentioned SoCs and which do not have the X86_INTEL_LPSS enabled is
not useful.

This means that we can simplify things by replacing the PMC_ATOM Kconfig
option in Makefiles with X86_INTEL_LPSS and then drop the option.

Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/clk/x86/Makefile      | 4 +---
 drivers/platform/x86/Kconfig  | 5 -----
 drivers/platform/x86/Makefile | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
index 1244c4e568ff..c2088b3c4081 100644
--- a/drivers/clk/x86/Makefile
+++ b/drivers/clk/x86/Makefile
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_PMC_ATOM)		+= clk-pmc-atom.o
 obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE)	+= clk-fch.o
-clk-x86-lpss-y			:= clk-lpss-atom.o
-obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-x86-lpss.o
+obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-lpss-atom.o clk-pmc-atom.o
 obj-$(CONFIG_CLK_LGM_CGU)	+= clk-cgu.o clk-cgu-pll.o clk-lgm.o
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f08ad85683cb..85c396a43048 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1161,8 +1161,3 @@ config WINMATE_FM07_KEYS
 	  that delivers key events when these buttons are pressed.
 
 endif # X86_PLATFORM_DEVICES
-
-config PMC_ATOM
-       def_bool y
-       depends on PCI
-       select COMMON_CLK
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4a59f47a46e2..cc2a74713313 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -126,7 +126,7 @@ obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
 obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
 obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
-obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
+obj-$(CONFIG_X86_INTEL_LPSS)		+= pmc_atom.o
 
 # Siemens Simatic Industrial PCs
 obj-$(CONFIG_SIEMENS_SIMATIC_IPC)	+= simatic-ipc.o
-- 
2.36.0

Re: [PATCH 1/1] platform/x86: Drop the PMC_ATOM Kconfig option

[Andy Shevchenko]

On Tue, May 3, 2022 at 4:03 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> The def_bool y PMC_ATOM Kconfig option provides a couple of symbols used
> by the code enabled by the X86_INTEL_LPSS option and it registers some
> clocks. These clocks are only registered on Bay Trail, Cherry Trail and
> Brasswell Intel SoCs and kernels targeting these SoCs must always have
> the X86_INTEL_LPSS option enabled otherwise many things will not work.
>
> Building the PMC_ATOM code on kernels which are not targeting the
> mentioned SoCs and which do not have the X86_INTEL_LPSS enabled is
> not useful.
>
> This means that we can simplify things by replacing the PMC_ATOM Kconfig
> option in Makefiles with X86_INTEL_LPSS and then drop the option.

Looks good to me,
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/clk/x86/Makefile      | 4 +---
>  drivers/platform/x86/Kconfig  | 5 -----
>  drivers/platform/x86/Makefile | 2 +-
>  3 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
> index 1244c4e568ff..c2088b3c4081 100644
> --- a/drivers/clk/x86/Makefile
> +++ b/drivers/clk/x86/Makefile
> @@ -1,6 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> -obj-$(CONFIG_PMC_ATOM)         += clk-pmc-atom.o
>  obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE)  += clk-fch.o
> -clk-x86-lpss-y                 := clk-lpss-atom.o
> -obj-$(CONFIG_X86_INTEL_LPSS)   += clk-x86-lpss.o
> +obj-$(CONFIG_X86_INTEL_LPSS)   += clk-lpss-atom.o clk-pmc-atom.o
>  obj-$(CONFIG_CLK_LGM_CGU)      += clk-cgu.o clk-cgu-pll.o clk-lgm.o
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index f08ad85683cb..85c396a43048 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1161,8 +1161,3 @@ config WINMATE_FM07_KEYS
>           that delivers key events when these buttons are pressed.
>
>  endif # X86_PLATFORM_DEVICES
> -
> -config PMC_ATOM
> -       def_bool y
> -       depends on PCI
> -       select COMMON_CLK
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 4a59f47a46e2..cc2a74713313 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -126,7 +126,7 @@ obj-$(CONFIG_INTEL_SCU_PCI)         += intel_scu_pcidrv.o
>  obj-$(CONFIG_INTEL_SCU_PLATFORM)       += intel_scu_pltdrv.o
>  obj-$(CONFIG_INTEL_SCU_WDT)            += intel_scu_wdt.o
>  obj-$(CONFIG_INTEL_SCU_IPC_UTIL)       += intel_scu_ipcutil.o
> -obj-$(CONFIG_PMC_ATOM)                 += pmc_atom.o
> +obj-$(CONFIG_X86_INTEL_LPSS)           += pmc_atom.o
>
>  # Siemens Simatic Industrial PCs
>  obj-$(CONFIG_SIEMENS_SIMATIC_IPC)      += simatic-ipc.o
> --
> 2.36.0
>


-- 
With Best Regards,
Andy Shevchenko