On Tue, Jul 28, 2020 at 7:50 AM Agrawal, Akshu <aagrawal2@xxxxxxx> wrote: > > > On 7/27/2020 6:58 PM, Rafael J. Wysocki wrote: > > On Mon, Jul 20, 2020 at 7:06 AM Akshu Agrawal <akshu.agrawal@xxxxxxx> wrote: > >> AMD SoC general pupose clk is present in new platforms with > >> same MMIO mappings. We can reuse the same clk handler support > >> for other platforms. Hence, changing name from ST(SoC) to FCH(IP) > >> > >> Signed-off-by: Akshu Agrawal <akshu.agrawal@xxxxxxx> > > This patch and the [3/4] appear to be part of a larger series which > > isn't visible to me as a whole. > > Link to other patches: > > https://patchwork.kernel.org/patch/11672857/ > > https://patchwork.kernel.org/patch/11672861/ > > > > > Do you want me to apply them nevertheless? > > This patch on its own will cause compilation error as we need the second > patch. > > Since, there is dependency we need them to be merged together. Can you > or Stephen please suggest a way forward. I would prefer it to be routed through the clock tree. The APD changes are simple enough and I don't have any issues with them. Thanks! > >> --- > >> drivers/acpi/acpi_apd.c | 14 +++++++------- > >> .../linux/platform_data/{clk-st.h => clk-fch.h} | 10 +++++----- > >> 2 files changed, 12 insertions(+), 12 deletions(-) > >> rename include/linux/platform_data/{clk-st.h => clk-fch.h} (53%) > >> > >> diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c > >> index ba2612e9a0eb..2d99e46add1a 100644 > >> --- a/drivers/acpi/acpi_apd.c > >> +++ b/drivers/acpi/acpi_apd.c > >> @@ -8,7 +8,7 @@ > >> */ > >> > >> #include <linux/clk-provider.h> > >> -#include <linux/platform_data/clk-st.h> > >> +#include <linux/platform_data/clk-fch.h> > >> #include <linux/platform_device.h> > >> #include <linux/pm_domain.h> > >> #include <linux/clkdev.h> > >> @@ -79,11 +79,11 @@ static int misc_check_res(struct acpi_resource *ares, void *data) > >> return !acpi_dev_resource_memory(ares, &res); > >> } > >> > >> -static int st_misc_setup(struct apd_private_data *pdata) > >> +static int fch_misc_setup(struct apd_private_data *pdata) > >> { > >> struct acpi_device *adev = pdata->adev; > >> struct platform_device *clkdev; > >> - struct st_clk_data *clk_data; > >> + struct fch_clk_data *clk_data; > >> struct resource_entry *rentry; > >> struct list_head resource_list; > >> int ret; > >> @@ -106,7 +106,7 @@ static int st_misc_setup(struct apd_private_data *pdata) > >> > >> acpi_dev_free_resource_list(&resource_list); > >> > >> - clkdev = platform_device_register_data(&adev->dev, "clk-st", > >> + clkdev = platform_device_register_data(&adev->dev, "clk-fch", > >> PLATFORM_DEVID_NONE, clk_data, > >> sizeof(*clk_data)); > >> return PTR_ERR_OR_ZERO(clkdev); > >> @@ -135,8 +135,8 @@ static const struct apd_device_desc cz_uart_desc = { > >> .properties = uart_properties, > >> }; > >> > >> -static const struct apd_device_desc st_misc_desc = { > >> - .setup = st_misc_setup, > >> +static const struct apd_device_desc fch_misc_desc = { > >> + .setup = fch_misc_setup, > >> }; > >> #endif > >> > >> @@ -239,7 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { > >> { "AMD0020", APD_ADDR(cz_uart_desc) }, > >> { "AMDI0020", APD_ADDR(cz_uart_desc) }, > >> { "AMD0030", }, > >> - { "AMD0040", APD_ADDR(st_misc_desc)}, > >> + { "AMD0040", APD_ADDR(fch_misc_desc)}, > >> #endif > >> #ifdef CONFIG_ARM64 > >> { "APMC0D0F", APD_ADDR(xgene_i2c_desc) }, > >> diff --git a/include/linux/platform_data/clk-st.h b/include/linux/platform_data/clk-fch.h > >> similarity index 53% > >> rename from include/linux/platform_data/clk-st.h > >> rename to include/linux/platform_data/clk-fch.h > >> index 7cdb6a402b35..850ca776156d 100644 > >> --- a/include/linux/platform_data/clk-st.h > >> +++ b/include/linux/platform_data/clk-fch.h > >> @@ -1,17 +1,17 @@ > >> /* SPDX-License-Identifier: MIT */ > >> /* > >> - * clock framework for AMD Stoney based clock > >> + * clock framework for AMD misc clocks > >> * > >> * Copyright 2018 Advanced Micro Devices, Inc. > >> */ > >> > >> -#ifndef __CLK_ST_H > >> -#define __CLK_ST_H > >> +#ifndef __CLK_FCH_H > >> +#define __CLK_FCH_H > >> > >> #include <linux/compiler.h> > >> > >> -struct st_clk_data { > >> +struct fch_clk_data { > >> void __iomem *base; > >> }; > >> > >> -#endif /* __CLK_ST_H */ > >> +#endif /* __CLK_FCH_H */ > >> -- > >> 2.20.1 > >>
