Skip to content

Commit

Permalink
clk: x86: Rename clk-lpt to more specific clk-lpss-atom
Browse files Browse the repository at this point in the history
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@linux.intel.com>
Link: https://lore.kernel.org/r/20210722193450.35321-1-andriy.shevchenko@linux.intel.com
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Stephen Boyd committed Jul 27, 2021
1 parent e73f0f0 commit cf0a956
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
6 changes: 4 additions & 2 deletions drivers/acpi/acpi_lpss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/clk/x86/Makefile
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions drivers/clk/x86/clk-lpt.c → drivers/clk/x86/clk-lpss-atom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
2 changes: 1 addition & 1 deletion include/linux/platform_data/x86/clk-lpss.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit cf0a956

Please sign in to comment.