* [PATCH 1/2] clk: x86: Change name from ST to FCH @ 2020-07-07 10:06 Akshu Agrawal 2020-07-07 10:07 ` [PATCH 2/2] clk: x86: Support RV architecture Akshu Agrawal ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Akshu Agrawal @ 2020-07-07 10:06 UTC (permalink / raw) Cc: akshu.agrawal, Michael Turquette, Stephen Boyd, Rahul Tanwar, open list:COMMON CLK FRAMEWORK, open list AMD SoC general pupose clk is present in new platforms with minor differences. We can reuse the same clk driver for other platforms. Hence, changing name from ST(SoC) to FCH(IP) Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com> --- This patch is dependant on https://patchwork.kernel.org/patch/11648129/ drivers/clk/x86/Makefile | 2 +- drivers/clk/x86/{clk-st.c => clk-fch.c} | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) rename drivers/clk/x86/{clk-st.c => clk-fch.c} (73%) diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile index 7c774ea7ddeb..18564efdc651 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-st.o +obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE) += clk-fch.o clk-x86-lpss-objs := clk-lpt.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-st.c b/drivers/clk/x86/clk-fch.c similarity index 73% rename from drivers/clk/x86/clk-st.c rename to drivers/clk/x86/clk-fch.c index 25d4b97aff9b..b252f0cf0628 100644 --- a/drivers/clk/x86/clk-st.c +++ b/drivers/clk/x86/clk-fch.c @@ -8,7 +8,7 @@ #include <linux/clk.h> #include <linux/clkdev.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> /* Clock Driving Strength 2 register */ @@ -29,12 +29,12 @@ static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" }; static struct clk_hw *hws[ST_MAX_CLKS]; -static int st_clk_probe(struct platform_device *pdev) +static int fch_clk_probe(struct platform_device *pdev) { - struct st_clk_data *st_data; + struct fch_clk_data *fch_data; - st_data = dev_get_platdata(&pdev->dev); - if (!st_data || !st_data->base) + fch_data = dev_get_platdata(&pdev->dev); + if (!fch_data || !fch_data->base) return -EINVAL; hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", NULL, 0, @@ -44,12 +44,12 @@ static int st_clk_probe(struct platform_device *pdev) hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux", clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents), - 0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL); + 0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL); clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk); hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux", - 0, st_data->base + MISCCLKCNTL1, OSCCLKENB, + 0, fch_data->base + MISCCLKCNTL1, OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL); devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1", @@ -58,7 +58,7 @@ static int st_clk_probe(struct platform_device *pdev) return 0; } -static int st_clk_remove(struct platform_device *pdev) +static int fch_clk_remove(struct platform_device *pdev) { int i; @@ -67,12 +67,12 @@ static int st_clk_remove(struct platform_device *pdev) return 0; } -static struct platform_driver st_clk_driver = { +static struct platform_driver fch_clk_driver = { .driver = { - .name = "clk-st", + .name = "clk-fch", .suppress_bind_attrs = true, }, - .probe = st_clk_probe, - .remove = st_clk_remove, + .probe = fch_clk_probe, + .remove = fch_clk_remove, }; -builtin_platform_driver(st_clk_driver); +builtin_platform_driver(fch_clk_driver); -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] clk: x86: Support RV architecture 2020-07-07 10:06 [PATCH 1/2] clk: x86: Change name from ST to FCH Akshu Agrawal @ 2020-07-07 10:07 ` Akshu Agrawal 2020-07-07 13:12 ` kernel test robot 2020-07-07 13:21 ` kernel test robot 2 siblings, 0 replies; 8+ messages in thread From: Akshu Agrawal @ 2020-07-07 10:07 UTC (permalink / raw) Cc: akshu.agrawal, Michael Turquette, Stephen Boyd, open list:COMMON CLK FRAMEWORK, open list There is minor difference between previous family of SoC and the current one. Which is the there is only 48Mh fixed clk. There is no mux and no option to select another freq as there in previous. Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com> --- This patch is dependant on https://patchwork.kernel.org/patch/11648131/ drivers/clk/x86/clk-fch.c | 55 ++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c index b252f0cf0628..a8aac71a3b65 100644 --- a/drivers/clk/x86/clk-fch.c +++ b/drivers/clk/x86/clk-fch.c @@ -26,6 +26,10 @@ #define ST_CLK_GATE 3 #define ST_MAX_CLKS 4 +#define RV_CLK_48M 0 +#define RV_CLK_GATE 1 +#define RV_MAX_CLKS 2 + static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" }; static struct clk_hw *hws[ST_MAX_CLKS]; @@ -37,23 +41,36 @@ static int fch_clk_probe(struct platform_device *pdev) if (!fch_data || !fch_data->base) return -EINVAL; - hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", NULL, 0, - 48000000); - hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz", NULL, 0, - 25000000); + if (!fch_data->is_rv) { + hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", + NULL, 0, 48000000); + hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz", + NULL, 0, 25000000); + + hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux", + clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents), + 0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, + NULL); + + clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk); - hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux", - clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents), - 0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL); + hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", + "oscout1_mux", 0, fch_data->base + MISCCLKCNTL1, + OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL); - clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk); + devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], + "oscout1", NULL); + } else { + hws[RV_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", + NULL, 0, 48000000); - hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux", - 0, fch_data->base + MISCCLKCNTL1, OSCCLKENB, - CLK_GATE_SET_TO_DISABLE, NULL); + hws[RV_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", + "clk48MHz", 0, fch_data->base + MISCCLKCNTL1, + OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL); - devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1", - NULL); + devm_clk_hw_register_clkdev(&pdev->dev, hws[RV_CLK_GATE], + "oscout1", NULL); + } return 0; } @@ -61,9 +78,17 @@ static int fch_clk_probe(struct platform_device *pdev) static int fch_clk_remove(struct platform_device *pdev) { int i; + struct fch_clk_data *fch_data; + + fch_data = dev_get_platdata(&pdev->dev); - for (i = 0; i < ST_MAX_CLKS; i++) - clk_hw_unregister(hws[i]); + if (!fch_data->is_rv) { + for (i = 0; i < ST_MAX_CLKS; i++) + clk_hw_unregister(hws[i]); + } else { + for (i = 0; i < RV_MAX_CLKS; i++) + clk_hw_unregister(hws[i]); + } return 0; } -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH 2020-07-07 10:06 [PATCH 1/2] clk: x86: Change name from ST to FCH Akshu Agrawal @ 2020-07-07 13:12 ` kernel test robot 2020-07-07 13:12 ` kernel test robot 2020-07-07 13:21 ` kernel test robot 2 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2020-07-07 13:12 UTC (permalink / raw) To: Akshu Agrawal Cc: kbuild-all, clang-built-linux, akshu.agrawal, Michael Turquette, Stephen Boyd, Rahul Tanwar, open list:COMMON CLK FRAMEWORK, open list [-- Attachment #1: Type: text/plain, Size: 1713 bytes --] Hi Akshu, Thank you for the patch! Yet something to improve: [auto build test ERROR on clk/clk-next] [also build test ERROR on v5.8-rc4 next-20200707] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Akshu-Agrawal/clk-x86-Change-name-from-ST-to-FCH/20200707-181006 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 02946de3802d3bc65bc9f2eb9b8d4969b5a7add8) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install x86_64 cross compiling tool for clang build # apt-get install binutils-x86-64-linux-gnu # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/clk/x86/clk-fch.c:11:10: fatal error: 'linux/platform_data/clk-fch.h' file not found #include <linux/platform_data/clk-fch.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. vim +11 drivers/clk/x86/clk-fch.c > 11 #include <linux/platform_data/clk-fch.h> 12 #include <linux/platform_device.h> 13 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 75342 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH @ 2020-07-07 13:12 ` kernel test robot 0 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2020-07-07 13:12 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 1756 bytes --] Hi Akshu, Thank you for the patch! Yet something to improve: [auto build test ERROR on clk/clk-next] [also build test ERROR on v5.8-rc4 next-20200707] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Akshu-Agrawal/clk-x86-Change-name-from-ST-to-FCH/20200707-181006 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 02946de3802d3bc65bc9f2eb9b8d4969b5a7add8) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install x86_64 cross compiling tool for clang build # apt-get install binutils-x86-64-linux-gnu # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/clk/x86/clk-fch.c:11:10: fatal error: 'linux/platform_data/clk-fch.h' file not found #include <linux/platform_data/clk-fch.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. vim +11 drivers/clk/x86/clk-fch.c > 11 #include <linux/platform_data/clk-fch.h> 12 #include <linux/platform_device.h> 13 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org [-- Attachment #2: config.gz --] [-- Type: application/gzip, Size: 75342 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH 2020-07-07 13:12 ` kernel test robot (?) @ 2020-07-11 16:32 ` Stephen Boyd 2020-07-13 0:47 ` Agrawal, Akshu -1 siblings, 1 reply; 8+ messages in thread From: Stephen Boyd @ 2020-07-11 16:32 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 251 bytes --] Quoting kernel test robot (2020-07-07 06:12:22) > Hi Akshu, > > Thank you for the patch! Yet something to improve: I also can't read your patches because you didn't send them "To:" anyone. Please resend properly after fixing the kbuild errors. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH 2020-07-11 16:32 ` Stephen Boyd @ 2020-07-13 0:47 ` Agrawal, Akshu 0 siblings, 0 replies; 8+ messages in thread From: Agrawal, Akshu @ 2020-07-13 0:47 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 674 bytes --] On 7/11/2020 10:02 PM, Stephen Boyd wrote: > Quoting kernel test robot (2020-07-07 06:12:22) >> Hi Akshu, >> >> Thank you for the patch! Yet something to improve: > I also can't read your patches because you didn't send them "To:" > anyone. Please resend properly after fixing the kbuild errors. This patch has a dependency on an acpi patch. I have mentioned the same after the signed-off "This patch is dependant on https://patchwork.kernel.org/patch/11648129/" <https://patchwork.kernel.org/patch/11648129/> What I will do is send the entire series together and add you in cc to acpi patches as well. Also, someone in "To:" Thanks, Akshu [-- Attachment #2: attachment.htm --] [-- Type: text/html, Size: 37227 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH 2020-07-07 10:06 [PATCH 1/2] clk: x86: Change name from ST to FCH Akshu Agrawal @ 2020-07-07 13:21 ` kernel test robot 2020-07-07 13:12 ` kernel test robot 2020-07-07 13:21 ` kernel test robot 2 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2020-07-07 13:21 UTC (permalink / raw) To: Akshu Agrawal Cc: kbuild-all, akshu.agrawal, Michael Turquette, Stephen Boyd, Rahul Tanwar, open list:COMMON CLK FRAMEWORK, open list [-- Attachment #1: Type: text/plain, Size: 1365 bytes --] Hi Akshu, Thank you for the patch! Yet something to improve: [auto build test ERROR on clk/clk-next] [also build test ERROR on v5.8-rc4 next-20200707] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Akshu-Agrawal/clk-x86-Change-name-from-ST-to-FCH/20200707-181006 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: x86_64-rhel-7.6 (attached as .config) compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/clk/x86/clk-fch.c:11:10: fatal error: linux/platform_data/clk-fch.h: No such file or directory 11 | #include <linux/platform_data/clk-fch.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. vim +11 drivers/clk/x86/clk-fch.c > 11 #include <linux/platform_data/clk-fch.h> 12 #include <linux/platform_device.h> 13 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 49248 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] clk: x86: Change name from ST to FCH @ 2020-07-07 13:21 ` kernel test robot 0 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2020-07-07 13:21 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 1404 bytes --] Hi Akshu, Thank you for the patch! Yet something to improve: [auto build test ERROR on clk/clk-next] [also build test ERROR on v5.8-rc4 next-20200707] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Akshu-Agrawal/clk-x86-Change-name-from-ST-to-FCH/20200707-181006 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: x86_64-rhel-7.6 (attached as .config) compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/clk/x86/clk-fch.c:11:10: fatal error: linux/platform_data/clk-fch.h: No such file or directory 11 | #include <linux/platform_data/clk-fch.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. vim +11 drivers/clk/x86/clk-fch.c > 11 #include <linux/platform_data/clk-fch.h> 12 #include <linux/platform_device.h> 13 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org [-- Attachment #2: config.gz --] [-- Type: application/gzip, Size: 49248 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-13 0:47 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-07-07 10:06 [PATCH 1/2] clk: x86: Change name from ST to FCH Akshu Agrawal 2020-07-07 10:07 ` [PATCH 2/2] clk: x86: Support RV architecture Akshu Agrawal 2020-07-07 13:12 ` [PATCH 1/2] clk: x86: Change name from ST to FCH kernel test robot 2020-07-07 13:12 ` kernel test robot 2020-07-11 16:32 ` Stephen Boyd 2020-07-13 0:47 ` Agrawal, Akshu 2020-07-07 13:21 ` kernel test robot 2020-07-07 13:21 ` kernel test robot
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.