* [PATCH] ARM: Use generic clkdev.h header @ 2016-01-27 22:11 Stephen Boyd 2016-01-28 12:32 ` Arnd Bergmann 0 siblings, 1 reply; 5+ messages in thread From: Stephen Boyd @ 2016-01-27 22:11 UTC (permalink / raw) To: linux-arm-kernel Get rid of the clkdev.h file in the ARM port and use the generic one because we've gotten rid of all the machine specific mach/clkdev.h files. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/include/asm/Kbuild | 1 + arch/arm/include/asm/clkdev.h | 31 ------------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 arch/arm/include/asm/clkdev.h diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 16da6380eb85..43cd07708cf9 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -1,6 +1,7 @@ generic-y += bitsperlong.h +generic-y += clkdev.h generic-y += cputime.h generic-y += current.h generic-y += early_ioremap.h diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h deleted file mode 100644 index 4e8a4b27d7c7..000000000000 --- a/arch/arm/include/asm/clkdev.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * arch/arm/include/asm/clkdev.h - * - * Copyright (C) 2008 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Helper for the clk API to assist looking up a struct clk. - */ -#ifndef __ASM_CLKDEV_H -#define __ASM_CLKDEV_H - -#include <linux/slab.h> - -#ifndef CONFIG_COMMON_CLK -#ifdef CONFIG_HAVE_MACH_CLKDEV -#include <mach/clkdev.h> -#else -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) -#endif -#endif - -static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) -{ - return kzalloc(size, GFP_KERNEL); -} - -#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: Use generic clkdev.h header 2016-01-27 22:11 [PATCH] ARM: Use generic clkdev.h header Stephen Boyd @ 2016-01-28 12:32 ` Arnd Bergmann 2016-01-28 20:12 ` Stephen Boyd 0 siblings, 1 reply; 5+ messages in thread From: Arnd Bergmann @ 2016-01-28 12:32 UTC (permalink / raw) To: linux-arm-kernel On Wednesday 27 January 2016 14:11:42 Stephen Boyd wrote: > Get rid of the clkdev.h file in the ARM port and use the generic > one because we've gotten rid of all the machine specific > mach/clkdev.h files. > > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > Ah, nice! I had not even noticed it was the last one. The file is still also referenced by arch/arm/plat-versatile/clock.c, but we don't build that file any more and should remove it as well. Arnd ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: Use generic clkdev.h header 2016-01-28 12:32 ` Arnd Bergmann @ 2016-01-28 20:12 ` Stephen Boyd 2016-01-28 22:07 ` Arnd Bergmann 0 siblings, 1 reply; 5+ messages in thread From: Stephen Boyd @ 2016-01-28 20:12 UTC (permalink / raw) To: linux-arm-kernel On 01/28, Arnd Bergmann wrote: > On Wednesday 27 January 2016 14:11:42 Stephen Boyd wrote: > > Get rid of the clkdev.h file in the ARM port and use the generic > > one because we've gotten rid of all the machine specific > > mach/clkdev.h files. > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > > > Ah, nice! I had not even noticed it was the last one. > > The file is still also referenced by arch/arm/plat-versatile/clock.c, > but we don't build that file any more and should remove it as well. > Good catch. Here's that patch too. ---8<---- From: Stephen Boyd <sboyd@codeaurora.org> Subject: [PATCH] ARM: plat-versatile: Remove unused clock.c file This file isn't compiled anymore because PLAT_VERSATILE_CLOCK is never selected. Remove the file and the config. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/plat-versatile/Kconfig | 3 -- arch/arm/plat-versatile/Makefile | 1 - arch/arm/plat-versatile/clock.c | 74 ---------------------------------------- 3 files changed, 78 deletions(-) delete mode 100644 arch/arm/plat-versatile/clock.c diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig index 49b8ef91584a..98b9b8e9f698 100644 --- a/arch/arm/plat-versatile/Kconfig +++ b/arch/arm/plat-versatile/Kconfig @@ -1,8 +1,5 @@ if PLAT_VERSATILE -config PLAT_VERSATILE_CLOCK - bool - config PLAT_VERSATILE_SCHED_CLOCK bool diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 03c4900ac3f4..bff3ba889882 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,5 +1,4 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o diff --git a/arch/arm/plat-versatile/clock.c b/arch/arm/plat-versatile/clock.c deleted file mode 100644 index 5c8b6564fdc2..000000000000 --- a/arch/arm/plat-versatile/clock.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * linux/arch/arm/plat-versatile/clock.c - * - * Copyright (C) 2004 ARM Limited. - * Written by Deep Blue Solutions Limited. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/clk.h> -#include <linux/mutex.h> - -#include <asm/hardware/icst.h> - -#include <mach/clkdev.h> - -int clk_enable(struct clk *clk) -{ - return 0; -} -EXPORT_SYMBOL(clk_enable); - -void clk_disable(struct clk *clk) -{ -} -EXPORT_SYMBOL(clk_disable); - -unsigned long clk_get_rate(struct clk *clk) -{ - return clk->rate; -} -EXPORT_SYMBOL(clk_get_rate); - -long clk_round_rate(struct clk *clk, unsigned long rate) -{ - long ret = -EIO; - if (clk->ops && clk->ops->round) - ret = clk->ops->round(clk, rate); - return ret; -} -EXPORT_SYMBOL(clk_round_rate); - -int clk_set_rate(struct clk *clk, unsigned long rate) -{ - int ret = -EIO; - if (clk->ops && clk->ops->set) - ret = clk->ops->set(clk, rate); - return ret; -} -EXPORT_SYMBOL(clk_set_rate); - -long icst_clk_round(struct clk *clk, unsigned long rate) -{ - struct icst_vco vco; - vco = icst_hz_to_vco(clk->params, rate); - return icst_hz(clk->params, vco); -} -EXPORT_SYMBOL(icst_clk_round); - -int icst_clk_set(struct clk *clk, unsigned long rate) -{ - struct icst_vco vco; - - vco = icst_hz_to_vco(clk->params, rate); - clk->rate = icst_hz(clk->params, vco); - clk->ops->setvco(clk, vco); - - return 0; -} -EXPORT_SYMBOL(icst_clk_set); -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: Use generic clkdev.h header 2016-01-28 20:12 ` Stephen Boyd @ 2016-01-28 22:07 ` Arnd Bergmann 2016-02-10 8:15 ` Linus Walleij 0 siblings, 1 reply; 5+ messages in thread From: Arnd Bergmann @ 2016-01-28 22:07 UTC (permalink / raw) To: linux-arm-kernel On Thursday 28 January 2016 12:12:38 Stephen Boyd wrote: > From: Stephen Boyd <sboyd@codeaurora.org> > Subject: [PATCH] ARM: plat-versatile: Remove unused clock.c file > > This file isn't compiled anymore because PLAT_VERSATILE_CLOCK is > never selected. Remove the file and the config. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > arch/arm/plat-versatile/Kconfig | 3 -- > arch/arm/plat-versatile/Makefile | 1 - > arch/arm/plat-versatile/clock.c | 74 ---------------------------------------- > 3 files changed, 78 deletions(-) > delete mode 100644 arch/arm/plat-versatile/clock.c > Looks good, I've added it to my todo list for arm-soc in 4.6. I think Linus Walleij has some related work pending, so I'll let him Ack this patch or pick it up in his tree if he prefers. Acked-by: Arnd Bergmann <arnd@arndb.de> Arnd ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: Use generic clkdev.h header 2016-01-28 22:07 ` Arnd Bergmann @ 2016-02-10 8:15 ` Linus Walleij 0 siblings, 0 replies; 5+ messages in thread From: Linus Walleij @ 2016-02-10 8:15 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jan 28, 2016 at 11:07 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Thursday 28 January 2016 12:12:38 Stephen Boyd wrote: >> From: Stephen Boyd <sboyd@codeaurora.org> >> Subject: [PATCH] ARM: plat-versatile: Remove unused clock.c file >> >> This file isn't compiled anymore because PLAT_VERSATILE_CLOCK is >> never selected. Remove the file and the config. >> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- >> arch/arm/plat-versatile/Kconfig | 3 -- >> arch/arm/plat-versatile/Makefile | 1 - >> arch/arm/plat-versatile/clock.c | 74 ---------------------------------------- >> 3 files changed, 78 deletions(-) >> delete mode 100644 arch/arm/plat-versatile/clock.c >> > > Looks good, I've added it to my todo list for arm-soc in 4.6. > > I think Linus Walleij has some related work pending, so I'll > let him Ack this patch or pick it up in his tree if he prefers. > > Acked-by: Arnd Bergmann <arnd@arndb.de> OK yeah I have a bunch of Versatile family cleanups pending, I will put this in the bottom of the pile before the pull request, thanks! Yours, Linus Walleij ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-10 8:15 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-27 22:11 [PATCH] ARM: Use generic clkdev.h header Stephen Boyd 2016-01-28 12:32 ` Arnd Bergmann 2016-01-28 20:12 ` Stephen Boyd 2016-01-28 22:07 ` Arnd Bergmann 2016-02-10 8:15 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).