arm & sh: factorised duplicated clkdev.c
Subsystems (20)
PATCH v4 1/1 arm & sh: factorised duplicated clkdev.c
factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture.
as the code is identical at 99%
put the arch specific code for allocation as example in asm/clkdev.h
---
Hi,
rebase against v2.6.37-rc1
Best Regards,
J.
arch/arm/Kconfig | 42 +++--- arch/arm/common/Kconfig | 4 - arch/arm/common/Makefile | 1 - arch/arm/common/clkdev.c | 179 ------------------------- arch/arm/include/asm/clkdev.h | 22 +--- arch/arm/mach-bcmring/clock.c | 3 +- arch/arm/mach-bcmring/core.c | 2 +- arch/arm/mach-davinci/clock.h | 2 +- arch/arm/mach-ep93xx/clock.c | 2 +- arch/arm/mach-imx/clock-imx1.c | 3 +- arch/arm/mach-imx/clock-imx21.c | 2 +- arch/arm/mach-imx/clock-imx27.c | 2 +- arch/arm/mach-integrator/core.c | 3 +- arch/arm/mach-integrator/impd1.c | 3 +- arch/arm/mach-integrator/integrator_cp.c | 3 +- arch/arm/mach-lpc32xx/clock.c | 3 +- arch/arm/mach-mmp/clock.h | 2 +- arch/arm/mach-mx25/clock.c | 3 +- arch/arm/mach-mx3/clock-imx31.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 3 +- arch/arm/mach-mx5/clock-mx51.c | 2 +- arch/arm/mach-mxc91231/clock.c | 2 +- arch/arm/mach-nomadik/clock.c | 2 +- arch/arm/mach-nuc93x/clock.h | 2 +- arch/arm/mach-omap1/clock.c | 2 +- arch/arm/mach-omap2/dpll3xxx.c | 2 +- arch/arm/mach-pnx4008/clock.c | 3 +- arch/arm/mach-pxa/clock.c | 2 +- arch/arm/mach-pxa/clock.h | 2 +- arch/arm/mach-realview/core.c | 3 +- arch/arm/mach-shmobile/Kconfig | 6 +- arch/arm/mach-shmobile/clock-sh7367.c | 2 +- arch/arm/mach-shmobile/clock-sh7372.c | 2 +- arch/arm/mach-shmobile/clock-sh7377.c | 2 +- arch/arm/mach-tcc8k/clock.c | 3 +- arch/arm/mach-tegra/clock.c | 2 +- arch/arm/mach-tegra/clock.h | 2 +- arch/arm/mach-tegra/tegra2_clocks.c | 3 +- arch/arm/mach-u300/clock.c | 2 +- arch/arm/mach-ux500/clock.c | 3 +- arch/arm/mach-versatile/core.c | 3 +- arch/arm/mach-vexpress/ct-ca9x4.c | 3 +- arch/arm/mach-vexpress/v2m.c | 3 +- arch/arm/mach-w90x900/clock.h | 2 +- arch/arm/plat-omap/Kconfig | 4 +- arch/arm/plat-omap/include/plat/clkdev_omap.h | 2 +- arch/arm/plat-spear/include/plat/clock.h | 2 +- arch/arm/plat-stmp3xxx/clock.c | 2 +- arch/sh/Kconfig | 2 +- arch/sh/boards/mach-highlander/setup.c | 2 +- arch/sh/include/asm/clkdev.h | 38 +++--- arch/sh/kernel/Makefile | 2 +- arch/sh/kernel/clkdev.c | 171 ----------------------- arch/sh/kernel/cpu/clock-cpg.c | 2 +- arch/sh/kernel/cpu/clock.c | 16 --- arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 2 +- arch/sh/kernel/cpu/sh4a/clock-shx3.c | 2 +- drivers/Kconfig | 2 + drivers/Makefile | 2 + drivers/clk/Kconfig | 4 + drivers/clk/Makefile | 2 + drivers/clk/clkdev.c | 176 ++++++++++++++++++++++++ include/linux/clkdev.h | 36 +++++ 73 files changed, 328 insertions(+), 507 deletions(-) delete mode 100644 arch/arm/common/clkdev.c delete mode 100644 arch/sh/kernel/clkdev.c create mode 100644 drivers/clk/Kconfig create mode 100644 drivers/clk/Makefile create mode 100644 drivers/clk/clkdev.c create mode 100644 include/linux/clkdev.h
arch/arm/Kconfig +21 -21
@@ -221,7 +221,7 @@ config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" select ARM_AMBA select ARCH_HAS_CPUFREQ - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ICST select GENERIC_CLOCKEVENTS select PLAT_VERSATILE
@@ -231,7 +231,7 @@ config ARCH_INTEGRATOR config ARCH_REALVIEW bool "ARM Ltd. RealView family" select ARM_AMBA - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -245,7 +245,7 @@ config ARCH_VERSATILE bool "ARM Ltd. Versatile family" select ARM_AMBA select ARM_VIC - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -259,7 +259,7 @@ config ARCH_VEXPRESS select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_TIMER_SP804 - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select HAVE_CLK select ICST
@@ -280,7 +280,7 @@ config ARCH_BCMRING depends on MMU select CPU_V6 select ARM_AMBA - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB help
@@ -327,7 +327,7 @@ config ARCH_EP93XX select CPU_ARM920T select ARM_AMBA select ARM_VIC - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_REQUIRE_GPIOLIB select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_USES_GETTIMEOFFSET
@@ -347,14 +347,14 @@ config ARCH_MXC bool "Freescale MXC/iMX-based" select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB - select COMMON_CLKDEV + select CLKDEV_LOOKUP help Support for Freescale MXC/iMX-based family of processors config ARCH_STMP3XXX bool "Freescale STMP3xxx" select CPU_ARM926T - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select USB_ARCH_HAS_EHCI
@@ -472,7 +472,7 @@ config ARCH_LPC32XX select HAVE_IDE select ARM_AMBA select USB_ARCH_HAS_OHCI - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_TIME select GENERIC_CLOCKEVENTS help
@@ -506,7 +506,7 @@ config ARCH_MMP bool "Marvell PXA168/910/MMP2" depends on MMU select ARCH_REQUIRE_GPIOLIB - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select TICK_ONESHOT select PLAT_PXA
@@ -539,7 +539,7 @@ config ARCH_W90X900 bool "Nuvoton W90X900 CPU" select CPU_ARM926T select ARCH_REQUIRE_GPIOLIB - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS help Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -553,7 +553,7 @@ config ARCH_W90X900 config ARCH_NUC93X bool "Nuvoton NUC93X CPU" select CPU_ARM926T - select COMMON_CLKDEV + select CLKDEV_LOOKUP help Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a low-power and high performance MPEG-4/JPEG multimedia controller chip.
@@ -564,7 +564,7 @@ config ARCH_TEGRA select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_HAS_BARRIERS if CACHE_L2X0 select ARCH_HAS_CPUFREQ help
@@ -574,7 +574,7 @@ config ARCH_TEGRA config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" select CPU_ARM926T - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_USES_GETTIMEOFFSET help This enables support for Philips PNX4008 mobile platform.
@@ -584,7 +584,7 @@ config ARCH_PXA depends on MMU select ARCH_MTD_XIP select ARCH_HAS_CPUFREQ - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select TICK_ONESHOT
@@ -761,7 +761,7 @@ config ARCH_TCC_926 bool "Telechips TCC ARM926-based systems" select CPU_ARM926T select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS help Support for Telechips TCC ARM926-based systems.
@@ -785,7 +785,7 @@ config ARCH_U300 select ARM_AMBA select ARM_VIC select GENERIC_CLOCKEVENTS - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_GPIO help Support for ST-Ericsson U300 series mobile platforms.
@@ -795,7 +795,7 @@ config ARCH_U8500 select CPU_V7 select ARM_AMBA select GENERIC_CLOCKEVENTS - select COMMON_CLKDEV + select CLKDEV_LOOKUP select ARCH_REQUIRE_GPIOLIB help Support for ST-Ericsson's Ux500 architecture
@@ -805,7 +805,7 @@ config ARCH_NOMADIK select ARM_AMBA select ARM_VIC select CPU_ARM926T - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB help
@@ -817,7 +817,7 @@ config ARCH_DAVINCI select ARCH_REQUIRE_GPIOLIB select ZONE_DMA select HAVE_IDE - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_ALLOCATOR select ARCH_HAS_HOLES_MEMORYMODEL help
@@ -837,7 +837,7 @@ config PLAT_SPEAR bool "ST SPEAr" select ARM_AMBA select ARCH_REQUIRE_GPIOLIB - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select HAVE_CLK help
arch/arm/common/Kconfig +0 -4
@@ -37,7 +37,3 @@ config SHARP_PARAM config SHARP_SCOOP bool - -config COMMON_CLKDEV - bool - select HAVE_CLK
arch/arm/common/Makefile +0 -1
@@ -16,4 +16,3 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o obj-$(CONFIG_ARCH_IXP2000) += uengine.o obj-$(CONFIG_ARCH_IXP23XX) += uengine.o obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o -obj-$(CONFIG_COMMON_CLKDEV) += clkdev.o
arch/arm/common/clkdev.c deleted +0 -179
179 lines not on this page · raw message
arch/arm/include/asm/clkdev.h +6 -16
@@ -12,23 +12,13 @@#ifndef __ASM_CLKDEV_H#define __ASM_CLKDEV_H -struct clk ; -struct device ; +#include <linux/slab.h> -struct clk_lookup { -struct list_head node; -const char *dev_id; -const char *con_id; -struct clk *clk; -}; +#include <mach/clkdev.h> -struct clk_lookup *clkdev_alloc (struct clk *clk,const char *con_id, -const char *dev_fmt, ...); - -void clkdev_add (struct clk_lookup *cl); -void clkdev_drop (struct clk_lookup *cl); - -void clkdev_add_table (struct clk_lookup *,size_t ); -int clk_add_alias (const char *,const char *,char *,struct device *); +static inline struct clk_lookup_alloc *__clkdev_alloc (size_t size) +{ +return kzalloc (size,GFP_KERNEL ); +}#endif
arch/arm/mach-bcmring/clock.c +1 -2
@@ -21,13 +21,12 @@#include <linux/string.h> #include <linux/clk.h> #include <linux/spinlock.h> +#include <linux/clkdev.h> #include <mach/csp/hw_cfg.h> #include <mach/csp/chipcHw_def.h> #include <mach/csp/chipcHw_reg.h> #include <mach/csp/chipcHw_inline.h> -#include <asm/clkdev.h> -#include "clock.h" #define clk_is_primary (x) ((x)->type & CLK_TYPE_PRIMARY)
arch/arm/mach-bcmring/core.c +1 -1
@@ -30,10 +30,10 @@#include <linux/amba/bus.h> #include <linux/clocksource.h> #include <linux/clockchips.h> +#include <linux/clkdev.h> #include <mach/csp/mm_addr.h> #include <mach/hardware.h> -#include <asm/clkdev.h> #include <linux/io.h> #include <asm/irq.h> #include <asm/hardware/arm_timer.h>
arch/arm/mach-davinci/clock.h +1 -1
@@ -68,7 +68,7 @@#ifndef __ASSEMBLER__#include <linux/list.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #define PLLSTAT_GOSTAT BIT(0)#define PLLCMD_GOSET BIT(0)
arch/arm/mach-ep93xx/clock.c +1 -1
@@ -19,10 +19,10 @@#include <linux/string.h> #include <linux/io.h> #include <linux/spinlock.h> +#include <linux/clkdev.h> #include <mach/hardware.h> -#include <asm/clkdev.h> #include <asm/div64.h>
arch/arm/mach-imx/clock-imx1.c +1 -2
@@ -22,8 +22,7 @@#include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/hardware.h>
arch/arm/mach-imx/clock-imx21.c +1 -1
@@ -21,11 +21,11 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/hardware.h> #include <mach/common.h> -#include <asm/clkdev.h> #include <asm/div64.h> #define IO_ADDR_CCM (off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off)))
arch/arm/mach-imx/clock-imx27.c +1 -1
@@ -21,8 +21,8 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/div64.h> #include <mach/clock.h>
arch/arm/mach-integrator/core.c +1 -2
@@ -21,9 +21,8 @@#include <linux/amba/bus.h> #include <linux/amba/serial.h> #include <linux/io.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> -#include <mach/clkdev.h> #include <mach/hardware.h> #include <mach/platform.h> #include <asm/irq.h>
arch/arm/mach-integrator/impd1.c +1 -2
@@ -22,9 +22,8 @@#include <linux/amba/clcd.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> -#include <mach/clkdev.h> #include <asm/hardware/icst.h> #include <mach/lm.h> #include <mach/impd1.h>
arch/arm/mach-integrator/integrator_cp.c +1 -2
@@ -21,9 +21,8 @@#include <linux/amba/mmci.h> #include <linux/io.h> #include <linux/gfp.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> -#include <mach/clkdev.h> #include <mach/hardware.h> #include <mach/platform.h> #include <asm/irq.h>
arch/arm/mach-lpc32xx/clock.c +1 -2
@@ -90,10 +90,9 @@#include <linux/clk.h> #include <linux/amba/bus.h> #include <linux/amba/clcd.h> +#include <linux/clkdev.h> #include <mach/hardware.h> -#include <asm/clkdev.h> -#include <mach/clkdev.h> #include <mach/platform.h> #include "clock.h" #include "common.h"
arch/arm/mach-mmp/clock.h +1 -1
@@ -6,7 +6,7 @@* published by the Free Software Foundation. */ -#include <asm/clkdev.h> +#include <linux/clkdev.h> struct clkops {void (*enable)(struct clk *);
arch/arm/mach-mx25/clock.c +1 -2
@@ -21,8 +21,7 @@#include <linux/list.h> #include <linux/clk.h> #include <linux/io.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/hardware.h>
arch/arm/mach-mx3/clock-imx31.c +1 -1
@@ -23,8 +23,8 @@#include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/div64.h> #include <mach/clock.h>
arch/arm/mach-mx3/clock-imx35.c +1 -2
@@ -21,8 +21,7 @@#include <linux/list.h> #include <linux/clk.h> #include <linux/io.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/hardware.h>
arch/arm/mach-mx5/clock-mx51.c +1 -1
@@ -14,8 +14,8 @@#include <linux/delay.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/div64.h> #include <mach/hardware.h>
arch/arm/mach-mxc91231/clock.c +1 -1
@@ -2,12 +2,12 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/hardware.h> #include <mach/common.h> -#include <asm/clkdev.h> #include <asm/bug.h> #include <asm/div64.h>
arch/arm/mach-nomadik/clock.c +1 -1
@@ -7,7 +7,7 @@#include <linux/module.h> #include <linux/errno.h> #include <linux/clk.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include "clock.h" /*
arch/arm/mach-nuc93x/clock.h +1 -1
@@ -10,7 +10,7 @@* the Free Software Foundation; either version 2 of the License. */ -#include <asm/clkdev.h> +#include <linux/clkdev.h> void nuc93x_clk_enable (struct clk *clk,int enable);void clks_register (struct clk_lookup *clks,size_t num);
arch/arm/mach-omap1/clock.c +1 -1
@@ -17,9 +17,9 @@#include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/clkdev.h> #include <asm/mach-types.h> -#include <asm/clkdev.h> #include <plat/cpu.h> #include <plat/usb.h>
arch/arm/mach-omap2/dpll3xxx.c +1 -1
@@ -26,10 +26,10 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/bitops.h> +#include <linux/clkdev.h> #include <plat/cpu.h> #include <plat/clock.h> -#include <asm/clkdev.h> #include "clock.h" #include "prm.h"
arch/arm/mach-pnx4008/clock.c +1 -2
@@ -21,8 +21,7 @@#include <linux/err.h> #include <linux/delay.h> #include <linux/io.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/hardware.h> #include <mach/clock.h>
arch/arm/mach-pxa/clock.c +1 -1
@@ -11,8 +11,8 @@#include <linux/spinlock.h> #include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <mach/pxa2xx-regs.h> #include <mach/hardware.h>
arch/arm/mach-pxa/clock.h +1 -1
@@ -1,4 +1,4 @@ -#include <asm/clkdev.h> +#include <linux/clkdev.h> struct clkops {void (*enable)(struct clk *);
arch/arm/mach-realview/core.c +1 -2
@@ -30,8 +30,8 @@#include <linux/ata_platform.h> #include <linux/amba/mmci.h> #include <linux/gfp.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/system.h> #include <mach/hardware.h> #include <asm/irq.h>
@@ -47,7 +47,6 @@#include <asm/hardware/gic.h> -#include <mach/clkdev.h> #include <mach/platform.h> #include <mach/irqs.h> #include <plat/timer-sp.h>
arch/arm/mach-shmobile/Kconfig +3 -3
@@ -6,7 +6,7 @@ config ARCH_SH7367 bool "SH-Mobile G3 (SH7367)" select CPU_V6 select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select SH_CLK_CPG select GENERIC_CLOCKEVENTS
@@ -14,7 +14,7 @@ config ARCH_SH7377 bool "SH-Mobile G4 (SH7377)" select CPU_V7 select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select SH_CLK_CPG select GENERIC_CLOCKEVENTS
@@ -22,7 +22,7 @@ config ARCH_SH7372 bool "SH-Mobile AP4 (SH7372)" select CPU_V7 select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select SH_CLK_CPG select GENERIC_CLOCKEVENTS
arch/arm/mach-shmobile/clock-sh7367.c +1 -1
@@ -20,8 +20,8 @@#include <linux/kernel.h> #include <linux/io.h> #include <linux/sh_clk.h> +#include <linux/clkdev.h> #include <mach/common.h> -#include <asm/clkdev.h> /* SH7367 registers */ #define RTFRQCR 0xe6150000
arch/arm/mach-shmobile/clock-sh7372.c +1 -1
@@ -20,8 +20,8 @@#include <linux/kernel.h> #include <linux/io.h> #include <linux/sh_clk.h> +#include <linux/clkdev.h> #include <mach/common.h> -#include <asm/clkdev.h> /* SH7372 registers */ #define FRQCRA 0xe6150000
arch/arm/mach-shmobile/clock-sh7377.c +1 -1
@@ -20,8 +20,8 @@#include <linux/kernel.h> #include <linux/io.h> #include <linux/sh_clk.h> +#include <linux/clkdev.h> #include <mach/common.h> -#include <asm/clkdev.h> /* SH7377 registers */ #define RTFRQCR 0xe6150000
arch/arm/mach-tcc8k/clock.c +1 -2
@@ -12,8 +12,7 @@#include <linux/io.h> #include <linux/module.h> #include <linux/spinlock.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/clock.h> #include <mach/irqs.h>
arch/arm/mach-tegra/clock.c +1 -1
@@ -25,7 +25,7 @@#include <linux/slab.h> #include <linux/seq_file.h> #include <linux/regulator/consumer.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include "clock.h" #include "board.h"
arch/arm/mach-tegra/clock.h +1 -1
@@ -21,7 +21,7 @@#define __MACH_TEGRA_CLOCK_H#include <linux/list.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #define DIV_BUS (1 << 0)#define DIV_U71 (1 << 1)
arch/arm/mach-tegra/tegra2_clocks.c +1 -2
@@ -24,8 +24,7 @@#include <linux/delay.h> #include <linux/io.h> #include <linux/hrtimer.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <mach/iomap.h>
arch/arm/mach-u300/clock.c +1 -1
@@ -25,8 +25,8 @@#include <linux/timer.h> #include <linux/io.h> #include <linux/seq_file.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <mach/hardware.h> #include <mach/syscon.h>
arch/arm/mach-ux500/clock.c +1 -2
@@ -13,8 +13,7 @@#include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> - -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <plat/mtu.h> #include <mach/hardware.h>
arch/arm/mach-versatile/core.c +1 -2
@@ -31,8 +31,8 @@#include <linux/amba/pl022.h> #include <linux/io.h> #include <linux/gfp.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/system.h> #include <asm/irq.h> #include <asm/leds.h>
@@ -46,7 +46,6 @@#include <asm/mach/irq.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <mach/clkdev.h> #include <mach/hardware.h> #include <mach/platform.h> #include <plat/timer-sp.h>
arch/arm/mach-vexpress/ct-ca9x4.c +1 -2
@@ -8,8 +8,8 @@#include <linux/platform_device.h> #include <linux/amba/bus.h> #include <linux/amba/clcd.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/pgtable.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/cache-l2x0.h>
@@ -18,7 +18,6 @@#include <asm/pmu.h> #include <asm/smp_twd.h> -#include <mach/clkdev.h> #include <mach/ct-ca9x4.h> #include <plat/timer-sp.h>
arch/arm/mach-vexpress/v2m.c +1 -2
@@ -11,15 +11,14 @@#include <linux/spinlock.h> #include <linux/sysdev.h> #include <linux/usb/isp1760.h> +#include <linux/clkdev.h> -#include <asm/clkdev.h> #include <asm/sizes.h> #include <asm/mach/flash.h> #include <asm/mach/map.h> #include <asm/mach/time.h> #include <asm/hardware/arm_timer.h> -#include <mach/clkdev.h> #include <mach/motherboard.h> #include <plat/timer-sp.h>
arch/arm/mach-w90x900/clock.h +1 -1
@@ -10,7 +10,7 @@* the Free Software Foundation; either version 2 of the License. */ -#include <asm/clkdev.h> +#include <linux/clkdev.h> void nuc900_clk_enable (struct clk *clk,int enable);void nuc900_subclk_enable (struct clk *clk,int enable);
arch/arm/plat-omap/Kconfig +2 -2
@@ -11,13 +11,13 @@ choice config ARCH_OMAP1 bool "TI OMAP1" - select COMMON_CLKDEV + select CLKDEV_LOOKUP help "Systems based on omap7xx, omap15xx or omap16xx" config ARCH_OMAP2PLUS bool "TI OMAP2/3/4" - select COMMON_CLKDEV + select CLKDEV_LOOKUP help "Systems based on OMAP2, OMAP3 or OMAP4"
arch/arm/plat-omap/include/plat/clkdev_omap.h +1 -1
@@ -8,7 +8,7 @@ #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H #define __ARCH_ARM_PLAT_OMAP_INCLUDE_PLAT_CLKDEV_OMAP_H -#include <asm/clkdev.h> +#include <linux/clkdev.h> struct omap_clk { u16 cpu;
arch/arm/plat-spear/include/plat/clock.h +1 -1
@@ -15,7 +15,7 @@#define __PLAT_CLOCK_H#include <linux/list.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <linux/types.h> /* clk structure flags */
arch/arm/plat-stmp3xxx/clock.c +1 -1
@@ -25,9 +25,9 @@#include <linux/err.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/clkdev.h> #include <asm/mach-types.h> -#include <asm/clkdev.h> #include <mach/platform.h> #include <mach/regs-clkctrl.h>
arch/sh/Kconfig +1 -1
@@ -1,7 +1,7 @@ config SUPERH def_bool y select EMBEDDED - select HAVE_CLK + select CLKDEV_LOOKUP select HAVE_IDE if HAS_IOPORT select HAVE_MEMBLOCK select HAVE_OPROFILE
arch/sh/boards/mach-highlander/setup.c +1 -1
@@ -24,10 +24,10 @@#include <linux/interrupt.h> #include <linux/usb/r8a66597.h> #include <linux/usb/m66592.h> +#include <linux/clkdev.h> #include <net/ax88796.h> #include <asm/machvec.h> #include <mach/highlander.h> -#include <asm/clkdev.h> #include <asm/clock.h> #include <asm/heartbeat.h> #include <asm/io.h>
arch/sh/include/asm/clkdev.h +17 -21
@@ -1,9 +1,5 @@/* -* arch/sh/include/asm/clkdev.h -* -* Cloned from arch/arm/include/asm/clkdev.h: -* -* Copyright (C) 2008 Russell King. +* Copyright (C) 2010 Paul Mundt <[email protected]> * * 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
@@ -11,25 +7,25 @@* * Helper for the clk API to assist looking up a struct clk. */ -#ifndef __ASM_CLKDEV_H -#define __ASM_CLKDEV_H -struct clk ; +#ifndef __CLKDEV__H_ +#define __CLKDEV__H_ -struct clk_lookup { -struct list_head node; -const char *dev_id; -const char *con_id; -struct clk *clk; -}; +#include <linux/bootmem.h> +#include <linux/mm.h> +#include <linux/slab.h> -struct clk_lookup *clkdev_alloc (struct clk *clk,const char *con_id, -const char *dev_fmt, ...); +#include <asm/clock.h> -void clkdev_add (struct clk_lookup *cl); -void clkdev_drop (struct clk_lookup *cl); +static inline struct clk_lookup_alloc *__clkdev_alloc (size_t size) +{ +if (!slab_is_available ()) +return alloc_bootmem_low_pages (size); +else +return kzalloc (size,GFP_KERNEL ); +} -void clkdev_add_table (struct clk_lookup *,size_t ); -int clk_add_alias (const char *,const char *,char *,struct device *); +#define __clk_put (clk) +#define __clk_get (clk) ({ 1; }) -#endif +#endif /* __CLKDEV_H__ */
arch/sh/kernel/Makefile +1 -1
@@ -11,7 +11,7 @@ endif CFLAGS_REMOVE_return_address.o = -pg -obj-y := clkdev.o debugtraps.o dma-nommu.o dumpstack.o \ +obj-y := debugtraps.o dma-nommu.o dumpstack.o \ idle.o io.o irq.o irq_$(BITS).o kdebugfs.o \ machvec.o nmi_debug.o process.o \ process_$(BITS).o ptrace.o ptrace_$(BITS).o \
arch/sh/kernel/clkdev.c deleted +0 -171
171 lines not on this page · raw message
arch/sh/kernel/cpu/clock-cpg.c +1 -1
@@ -2,7 +2,7 @@#include <linux/compiler.h> #include <linux/slab.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> static struct clk master_clk = {
arch/sh/kernel/cpu/clock.c +0 -16
@@ -48,20 +48,4 @@ int __init clk_init(void)return ret; } -/* -* Returns a clock. Note that we first try to use device id on the bus -* and clock name. If this fails, we try to use clock name only. -*/ -struct clk *clk_get (struct device *dev,const char *con_id) -{ -const char *dev_id = dev ?dev_name (dev) :NULL ; - -return clk_get_sys (dev_id, con_id); -} -EXPORT_SYMBOL_GPL (clk_get); - -void clk_put (struct clk *clk) -{ -} -EXPORT_SYMBOL_GPL (clk_put);
arch/sh/kernel/cpu/sh4/clock-sh4-202.c +1 -1
@@ -13,7 +13,7 @@#include <linux/kernel.h> #include <linux/err.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h>
arch/sh/kernel/cpu/sh4a/clock-sh7343.c +1 -1
@@ -21,7 +21,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> /* SH7343 registers */
arch/sh/kernel/cpu/sh4a/clock-sh7366.c +1 -1
@@ -21,7 +21,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> /* SH7366 registers */
arch/sh/kernel/cpu/sh4a/clock-sh7722.c +1 -1
@@ -21,7 +21,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/hwblk.h> #include <cpu/sh7722.h>
arch/sh/kernel/cpu/sh4a/clock-sh7723.c +1 -1
@@ -22,7 +22,7 @@#include <linux/kernel.h> #include <linux/io.h> #include <linux/clk.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/hwblk.h> #include <cpu/sh7723.h>
arch/sh/kernel/cpu/sh4a/clock-sh7724.c +1 -1
@@ -22,7 +22,7 @@#include <linux/kernel.h> #include <linux/io.h> #include <linux/clk.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/hwblk.h> #include <cpu/sh7724.h>
arch/sh/kernel/cpu/sh4a/clock-sh7757.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h>
arch/sh/kernel/cpu/sh4a/clock-sh7763.c +1 -1
@@ -13,7 +13,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h> #include <asm/io.h>
arch/sh/kernel/cpu/sh4a/clock-sh7780.c +1 -1
@@ -12,7 +12,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h> #include <asm/io.h>
arch/sh/kernel/cpu/sh4a/clock-sh7785.c +1 -1
@@ -14,7 +14,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/cpufreq.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h> #include <cpu/sh7785.h>
arch/sh/kernel/cpu/sh4a/clock-sh7786.c +1 -1
@@ -13,7 +13,7 @@#include <linux/kernel.h> #include <linux/clk.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h>
arch/sh/kernel/cpu/sh4a/clock-shx3.c +1 -1
@@ -14,7 +14,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> #include <asm/freq.h>
drivers/Kconfig +2 -0
@@ -111,4 +111,6 @@ source "drivers/xen/Kconfig" source "drivers/staging/Kconfig" source "drivers/platform/Kconfig" + +source "drivers/clk/Kconfig" endmenu
drivers/Makefile +2 -0
@@ -115,3 +115,5 @@ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ obj-y += ieee802154/ +#common clk code +obj-y += clk/
drivers/clk/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ + +config CLKDEV_LOOKUP + bool + select HAVE_CLK
drivers/clk/Makefile new file +2 -0
@@ -0,0 +1,2 @@ + +obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
drivers/clk/clkdev.c new file +176 -0
176 lines not on this page · raw message
include/linux/clkdev.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* include/linux/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 __CLKDEV_H +#define __CLKDEV_H + +#include <asm/clkdev.h> + +struct clk ; +struct device ; + +struct clk_lookup { +struct list_head node; +const char *dev_id; +const char *con_id; +struct clk *clk; +}; + +struct clk_lookup *clkdev_alloc (struct clk *clk,const char *con_id, +const char *dev_fmt, ...); + +void clkdev_add (struct clk_lookup *cl); +void clkdev_drop (struct clk_lookup *cl); + +void clkdev_add_table (struct clk_lookup *,size_t ); +int clk_add_alias (const char *,const char *,char *,struct device *); + +#endif
Signature · 1 line
1.7.1
PATCH v4 1/1 arm & sh: factorised duplicated clkdev.c
Quoted 9 lines · Jean-Christophe PLAGNIOL-VILLARD
factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture.
as the code is identical at 99%
put the arch specific code for allocation as example in
asm/clkdev.hSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Acked-by Paul Mundt <[email protected]>
I've you've finally addressed Russell's comments and nothing else has changed, then you should just resubmit the updated version to the patch tracker.
PATCH v4 1/1 arm & sh: factorised duplicated clkdev.c
Quoted 6 lines · Paul Mundt
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture.
as the code is identical at 99%
Quoted 8 lines
Quoted 4 lines
put the arch specific code for allocation as example in
asm/clkdev.hSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Acked-by Paul Mundt <[email protected]>I've you've finally addressed Russell's comments and nothing else has changed, then you should just resubmit the updated version to the patch tracker.
did 6483/1
Best Regards,
J.
PATCH 1/1 ARM mxs: clkdev related compile fixes
From: Sascha Hauer <[email protected]>
Since commit
6d803ba (ARM: 6483/1: arm & sh: factorised duplicated clkdev.c)
platforms need to select CLKDEV_LOOKUP instead of COMMON_CLKDEV and need to include <linux/clkdev.h>.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-mxs/clock-mx23.c | 1 + arch/arm/mach-mxs/clock-mx28.c | 1 + 3 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/Kconfig +1 -1
@@ -368,7 +368,7 @@ config ARCH_MXS bool "Freescale MXS-based" select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB - select COMMON_CLKDEV + select CLKDEV_LOOKUP help Support for Freescale MXS-based family of processors
arch/arm/mach-mxs/clock-mx23.c +1 -0
@@ -21,6 +21,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/jiffies.h> +#include <linux/clkdev.h> #include <asm/clkdev.h> #include <asm/div64.h>
arch/arm/mach-mxs/clock-mx28.c +1 -0
@@ -21,6 +21,7 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/jiffies.h> +#include <linux/clkdev.h> #include <asm/clkdev.h> #include <asm/div64.h>
Signature · 1 line
1.7.2.3
PATCH 1/1 ARM mxs: clkdev related compile fixes
Quoted 8 lines · Uwe Kleine-K?nig
From: Sascha Hauer <[email protected]>
Since commit
6d803ba (ARM: 6483/1: arm & sh: factorised duplicated clkdev.c)platforms need to select
CLKDEV_LOOKUPinstead ofCOMMON_CLKDEVand need to include <linux/clkdev.h>.
Quoted 6 lines
Cc Shawn Guo <[email protected]>Cc Lothar Wa?mann <[email protected]>Signed-off-by Sascha Hauer <[email protected]>[ukl: make commit log more verbose; remove selection of COMMON_CLKDEV]Signed-off-by Uwe Kleine-K?nig <[email protected]>
Best Regards,
J.