On Thu, Jul 22, 2021 at 9:34 PM Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> The LPT stands for Lynxpoint PCH. However the driver is used on a few
> Intel Atom SoCs. Rename it to reflect this in a way how another clock
> driver, i.e. clk-pmc-atom, is called.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
>
> Good to go either via ACPI or CCF tree.
In case you want the latter:
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> drivers/acpi/acpi_lpss.c | 6 ++++--
> drivers/clk/x86/Makefile | 2 +-
> drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} | 12 ++++++------
> include/linux/platform_data/x86/clk-lpss.h | 2 +-
> 4 files changed, 12 insertions(+), 10 deletions(-)
> rename drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} (76%)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 894b7e6ae144..7f163074e4e4 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -385,7 +385,9 @@ static struct platform_device *lpss_clk_dev;
>
> static inline void lpt_register_clock_device(void)
> {
> - lpss_clk_dev = platform_device_register_simple("clk-lpt", -1, NULL, 0);
> + lpss_clk_dev = platform_device_register_simple("clk-lpss-atom",
> + PLATFORM_DEVID_NONE,
> + NULL, 0);
> }
>
> static int register_device_clock(struct acpi_device *adev,
> @@ -1337,7 +1339,7 @@ void __init acpi_lpss_init(void)
> const struct x86_cpu_id *id;
> int ret;
>
> - ret = lpt_clk_init();
> + ret = lpss_atom_clk_init();
> if (ret)
> return;
>
> diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
> index 18564efdc651..1244c4e568ff 100644
> --- a/drivers/clk/x86/Makefile
> +++ b/drivers/clk/x86/Makefile
> @@ -1,6 +1,6 @@
> # 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-objs := clk-lpt.o
> +clk-x86-lpss-y := clk-lpss-atom.o
> obj-$(CONFIG_X86_INTEL_LPSS) += clk-x86-lpss.o
> obj-$(CONFIG_CLK_LGM_CGU) += clk-cgu.o clk-cgu-pll.o clk-lgm.o
> diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpss-atom.c
> similarity index 76%
> rename from drivers/clk/x86/clk-lpt.c
> rename to drivers/clk/x86/clk-lpss-atom.c
> index fbe9fd3ed948..aa9d0bb98f8b 100644
> --- a/drivers/clk/x86/clk-lpt.c
> +++ b/drivers/clk/x86/clk-lpss-atom.c
> @@ -13,7 +13,7 @@
> #include <linux/platform_data/x86/clk-lpss.h>
> #include <linux/platform_device.h>
>
> -static int lpt_clk_probe(struct platform_device *pdev)
> +static int lpss_atom_clk_probe(struct platform_device *pdev)
> {
> struct lpss_clk_data *drvdata;
> struct clk *clk;
> @@ -34,14 +34,14 @@ static int lpt_clk_probe(struct platform_device *pdev)
> return 0;
> }
>
> -static struct platform_driver lpt_clk_driver = {
> +static struct platform_driver lpss_atom_clk_driver = {
> .driver = {
> - .name = "clk-lpt",
> + .name = "clk-lpss-atom",
> },
> - .probe = lpt_clk_probe,
> + .probe = lpss_atom_clk_probe,
> };
>
> -int __init lpt_clk_init(void)
> +int __init lpss_atom_clk_init(void)
> {
> - return platform_driver_register(&lpt_clk_driver);
> + return platform_driver_register(&lpss_atom_clk_driver);
> }
> diff --git a/include/linux/platform_data/x86/clk-lpss.h b/include/linux/platform_data/x86/clk-lpss.h
> index 207e1a317800..41df326583f9 100644
> --- a/include/linux/platform_data/x86/clk-lpss.h
> +++ b/include/linux/platform_data/x86/clk-lpss.h
> @@ -15,6 +15,6 @@ struct lpss_clk_data {
> struct clk *clk;
> };
>
> -extern int lpt_clk_init(void);
> +extern int lpss_atom_clk_init(void);
>
> #endif /* __CLK_LPSS_H */
> --
> 2.30.2
>
