Commit cf0a9565 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Stephen Boyd
Browse files

clk: x86: Rename clk-lpt to more specific clk-lpss-atom 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210722193450.35321-1-andriy.shevchenko@linux.intel.com


Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent e73f0f0e

drivers/acpi/acpi_lpss.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/clk/x86/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

drivers/clk/x86/clk-lpt.c→drivers/clk/x86/clk-lpss-atom.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

}

include/linux/platform_data/x86/clk-lpss.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */