Commit d58669b0 authored by Akshu Agrawal's avatar Akshu Agrawal Committed by Rafael J. Wysocki
Browse files

ACPI: APD: Change name from ST to FCH 



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: default avatarAkshu Agrawal <akshu.agrawal@amd.com>
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 384b02d6

drivers/acpi/acpi_apd.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
 */

 */





#include <linux/clk-provider.h>

#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/platform_device.h>

#include <linux/pm_domain.h>

#include <linux/pm_domain.h>

#include <linux/clkdev.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);

	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 acpi_device *adev = pdata->adev;

	struct platform_device *clkdev;

	struct platform_device *clkdev;

	struct st_clk_data *clk_data;

	struct fch_clk_data *clk_data;

	struct resource_entry *rentry;

	struct resource_entry *rentry;

	struct list_head resource_list;

	struct list_head resource_list;

	int ret;

	int ret;
@@ -106,7 +106,7 @@ static int st_misc_setup(struct apd_private_data *pdata) 




	acpi_dev_free_resource_list(&resource_list);

	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,

					       PLATFORM_DEVID_NONE, clk_data,

					       sizeof(*clk_data));

					       sizeof(*clk_data));

	return PTR_ERR_OR_ZERO(clkdev);

	return PTR_ERR_OR_ZERO(clkdev);
@@ -135,8 +135,8 @@ static const struct apd_device_desc cz_uart_desc = { 
	.properties = uart_properties,

	.properties = uart_properties,

};

};





static const struct apd_device_desc st_misc_desc = {

static const struct apd_device_desc fch_misc_desc = {

	.setup = st_misc_setup,

	.setup = fch_misc_setup,

};

};

#endif

#endif
@@ -239,7 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { 
	{ "AMD0020", APD_ADDR(cz_uart_desc) },

	{ "AMD0020", APD_ADDR(cz_uart_desc) },

	{ "AMDI0020", APD_ADDR(cz_uart_desc) },

	{ "AMDI0020", APD_ADDR(cz_uart_desc) },

	{ "AMD0030", },

	{ "AMD0030", },

	{ "AMD0040", APD_ADDR(st_misc_desc)},

	{ "AMD0040", APD_ADDR(fch_misc_desc)},

	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },

	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },

#endif

#endif

#ifdef CONFIG_ARM64

#ifdef CONFIG_ARM64

drivers/clk/x86/clk-st.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#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/platform_device.h>





/* Clock Driving Strength 2 register */

/* Clock Driving Strength 2 register */
@@ -31,7 +31,7 @@ static struct clk_hw *hws[ST_MAX_CLKS]; 




static int st_clk_probe(struct platform_device *pdev)

static int st_clk_probe(struct platform_device *pdev)

{

{

	struct st_clk_data *st_data;

	struct fch_clk_data *st_data;





	st_data = dev_get_platdata(&pdev->dev);

	st_data = dev_get_platdata(&pdev->dev);

	if (!st_data || !st_data->base)

	if (!st_data || !st_data->base)

include/linux/platform_data/clk-st.h→include/linux/platform_data/clk-fch.h

+5 −5
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* SPDX-License-Identifier: MIT */

/*

/*

 * clock framework for AMD Stoney based clock

 * clock framework for AMD misc clocks

 *

 *

 * Copyright 2018 Advanced Micro Devices, Inc.

 * Copyright 2018 Advanced Micro Devices, Inc.

 */

 */





#ifndef __CLK_ST_H

#ifndef __CLK_FCH_H

#define __CLK_ST_H

#define __CLK_FCH_H





#include <linux/compiler.h>

#include <linux/compiler.h>





struct st_clk_data {

struct fch_clk_data {

	void __iomem *base;

	void __iomem *base;

};

};





#endif /* __CLK_ST_H */
 
#endif /* __CLK_FCH_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE