Some cleanup for samsung clock
Subsystems (3)
cover Some cleanup for samsung clock
This patch series does some cleanup of samsung clock files and fixes one typo in clk.h
Pankaj Dubey (3):
clk: samsung: Spelling s/bwtween/between/
clk: samsung: remove unnecessary CONFIG_OF from clk.c
clk: samsung: remove unnecessary inclusion of header files from clk.h
drivers/clk/samsung/clk.c | 5 ++--- drivers/clk/samsung/clk.h | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 clk: samsung: Spelling s/bwtween/between/
--- drivers/clk/samsung/clk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/samsung/clk.h +1 -1
@@ -25,7 +25,7 @@* struct samsung_clk_provider: information about clock provider * @reg_base: virtual address for the register base. * @clk_data: holds clock related data like clk* and number of clocks. -* @lock: maintains exclusion bwtween callbacks for a given clock-provider. +* @lock: maintains exclusion between callbacks for a given clock-provider. */ struct samsung_clk_provider {void __iomem *reg_base;
Signature · 1 line
1.7.9.5
PATCH 1/3 clk: samsung: Spelling s/bwtween/between/
Hi Pankaj,
Quoted 1 line · Pankaj Dubey
Signed-off-by Pankaj Dubey <[email protected]>
Even though the patch is obvious, it should have at least one line of description.
Best regards,
Tomasz
PATCH 2/3 clk: samsung: remove unnecessary CONFIG_OF from clk.c
In reply to Pankaj Dubey--- drivers/clk/samsung/clk.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/samsung/clk.c +0 -2
@@ -281,7 +281,6 @@ void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx,* obtain the clock speed of all external fixed clock sources from device * tree and register it */ -#ifdef CONFIG_OF void __init samsung_clk_of_register_fixed_ext(struct samsung_clk_provider *ctx, struct samsung_fixed_rate_clock *fixed_rate_clk, unsigned int nr_fixed_rate_clk,
@@ -298,7 +297,6 @@ void __init samsung_clk_of_register_fixed_ext(struct samsung_clk_provider *ctx, }samsung_clk_register_fixed_rate (ctx, fixed_rate_clk, nr_fixed_rate_clk); } -#endif /* utility function to get the rate of a specified clock */ unsigned long _get_rate (const char *clk_name)
Signature · 1 line
1.7.9.5
PATCH 2/3 clk: samsung: remove unnecessary CONFIG_OF from clk.c
Hi Pankaj,
Quoted 1 line · Pankaj Dubey
Signed-off-by Pankaj Dubey <[email protected]>
Missing patch description.
drivers/clk/samsung/clk.c void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx, · line 284
Quoted 13 lines
--- drivers/clk/samsung/clk.c | 2 -- 1 file changed, 2 deletions(-)drivers/clk/samsung/clk.c +0
-1@@ -281,7 +281,6 @@ void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx,* obtain the clock speed of all external fixed clock sources from device * tree and register it */ -#ifdef CONFIG_OF
We still have non-DT platforms which use this code, i.e. s3c24xx and s3c64xx. Have you checked if this compiles fine on them with CONFIG_OF disabled?
Best regards,
Tomasz
PATCH 2/3 clk: samsung: remove unnecessary CONFIG_OF from clk.c
Hi Tomasz,
On Saturday, September 27, 2014 6:51 PM, Tomasz Figa wrote,
Quoted 6 lines
Hi Pankaj,
Quoted 1 line · Pankaj Dubey
Signed-off-by Pankaj Dubey <[email protected]>Missing patch description.
OK, will add it.
Quoted 5 lines
Quoted 5 lines
--- drivers/clk/samsung/clk.c | 2 -- 1 file changed, 2 deletions(-)
Quoted 7 lines
drivers/clk/samsung/clk.c void __init samsung_clk_register_gate(struct
Quoted 5 lines
drivers/clk/samsung/clk.c +0
-0@@ -281,7 +281,6 @@ void __init samsung_clk_register_gate(struct
samsung_clk_provider*ctx,Quoted 1 line
drivers/clk/samsung/clk.c +0
-0* obtain the clock speed of all external fixed clock sources from
device
Quoted 5 lines
drivers/clk/samsung/clk.c void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx, · line 284
Quoted 3 lines
drivers/clk/samsung/clk.c +0
-1* tree and register it */ -#ifdef CONFIG_OF We still have non-DT platforms which use this code, i.e. s3c24xx and
s3c64xx. Have
Quoted 2 lines
you checked if this compiles fine on them with
CONFIG_OFdisabled?
Compile tested with s3c2410_defconfig and s3c6400_defconfig, and its compiled fine.
In both cases CONFIG_OF was disabled.
Thanks,
Pankaj Dubey
Quoted 2 lines
Best regards,
Tomasz
PATCH 3/3 clk: samsung: remove unnecessary inclusion of header files from clk.h
In reply to Pankaj DubeyLet's remove unnecessary include of header files from clk.h and add required one in clk.c
--- drivers/clk/samsung/clk.c | 3 ++- drivers/clk/samsung/clk.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/clk/samsung/clk.c +2 -1
@@ -11,7 +11,8 @@* clock framework for Samsung platforms. */ -#include <linux/syscore_ops.h> +#include <linux/of_address.h> +#include "clk.h" void samsung_clk_save(void __iomem *base,
drivers/clk/samsung/clk.h +0 -4
@@ -13,12 +13,8 @@#ifndef __SAMSUNG_CLK_H#define __SAMSUNG_CLK_H -#include <linux/clk.h> #include <linux/clkdev.h> -#include <linux/io.h> #include <linux/clk-provider.h> -#include <linux/of.h> -#include <linux/of_address.h> #include "clk-pll.h" /**
Signature · 1 line
1.7.9.5
Sylwester Nawrocki
maintainerPATCH 3/3 clk: samsung: remove unnecessary inclusion of header files from clk.h
Hi Pankaj,
Quoted 14 lines · Pankaj Dubey
Let's remove unnecessary include of header files from
clk.hand add required one inclk.cSigned-off-by Pankaj Dubey <[email protected]>--- drivers/clk/samsung/clk.c | 3 ++- drivers/clk/samsung/clk.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)drivers/clk/samsung/clk.c +0
-0
drivers/clk/samsung/clk.c line 14
Quoted 4 lines
drivers/clk/samsung/clk.c +0
-1@@ -11,7 +11,8 @@* clock framework for Samsung platforms. */ -#include <linux/syscore_ops.h>
I've dropped this change when applying since it causes a build break:
drivers/clk/samsung/clk.c:338:15: error: variable ?samsung_clk_syscore_ops? has initializer but incomplete type drivers/clk/samsung/clk.c:339:2: error: unknown field ?suspend? specified in initializer drivers/clk/samsung/clk.c:339:2: warning: excess elements in struct initializer [enabled by default] drivers/clk/samsung/clk.c:339:2: warning: (near initialization for ?samsung_clk_syscore_ops?) [enabled by default] drivers/clk/samsung/clk.c:340:2: error: unknown field ?resume? specified in initializer drivers/clk/samsung/clk.c:340:2: warning: excess elements in struct initializer [enabled by default]drivers/clk/samsung/clk.c:340:2: warning: (near initialization for ?samsung_clk_syscore_ops?) [enabled by default] CC drivers/dma/virt-dma.o
drivers/clk/samsung/clk.c: In function ?samsung_clk_sleep_init?:drivers/clk/samsung/clk.c:359:3: error: implicit declaration of function ?register_syscore_ops? [-Werror=implicit-function-declaration]
Please make sure there is no build breaks with various configs when sending patches.
--
Regards,
Sylwester
PATCH 3/3 clk: samsung: remove unnecessary inclusion of header files from clk.h
Hi Sylwester,
Quoted 6 lines · Sylwester Nawrocki
Hi Pankaj,
Quoted 3 lines · Pankaj Dubey
Let's remove unnecessary include of header files from
clk.hand add required one inclk.c
Quoted 8 lines
Quoted 6 lines
Signed-off-by Pankaj Dubey <[email protected]>--- drivers/clk/samsung/clk.c | 3 ++- drivers/clk/samsung/clk.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)Please make sure there is no build breaks with various configs when sending patches.
I am sure that I compile tested this before submitting. Looks like following commit [1] needs "linux/syscore-ops.h" in clk.c, before that it was not needed.
1: clk: samsung: Factor out the common code to clk.c [SHA_ID:16a9013b83b5106c83cf]
Anyways, I can see patches are not getting cleanly applied so, just now I resend them [2] after rebasing please have a look.
2: http://comments.gmane.org/gmane.linux.kernel.samsung-soc/40639
Thanks,
Pankaj Dubey
Quoted 5 lines
--
Regards,
Sylwester
Sylwester Nawrocki
maintainerPATCH 3/3 clk: samsung: remove unnecessary inclusion of header files from clk.h
Quoted 18 lines · Pankaj Dubey
Hi Sylwester,
Quoted 6 lines · Sylwester Nawrocki
Hi Pankaj,
Quoted 3 lines · Pankaj Dubey
Let's remove unnecessary include of header files from
clk.hand add required one inclk.cQuoted 8 lines
Quoted 6 lines
Signed-off-by Pankaj Dubey <[email protected]>--- drivers/clk/samsung/clk.c | 3 ++- drivers/clk/samsung/clk.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)Please make sure there is no build breaks with various configs when sending patches.
Quoted 6 lines
I am sure that I compile tested this before submitting. Looks like following commit [1] needs "
linux/syscore-ops.h" inclk.c, before that it was not needed.1: clk: samsung: Factor out the common code to
clk.c[SHA_ID:16a9013b83b5106c83cf]
OK, my apologies then for not investigating it further.
Quoted 2 lines
Anyways, I can see patches are not getting cleanly applied so, just now I resend them [2] after rebasing please have a look.
There is no need to resend, the patches are already applied into my tree
git://linuxtv.org/snawrocki/samsung.git for-v3.19/clk-next
I will probably send a second pull request for Mike today. Just need to figure out what to do with the patches addressing the dependency of the audio clock controller control registers on the APLL clock.
--
Regards,
Sylwester