Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM/clk: move the ICST library to drivers/clk

This moves the ICST clock divider helper library from
arch/arm/common to drivers/clk/versatile so it is maintained
with the other clock drivers.

We keep the structure as a helper library intact and do not
fuse it with the clk-icst.c Versatile ICST clock driver: there
may be other users out there that need to use this library for
their clocking, and then it will be helpful to keep the
library contained. (The icst.[c|h] files could just be moved
to drivers/clk/lib or a similar location to share the library.)

Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

+11 -12
-3
arch/arm/common/Kconfig
··· 1 - config ICST 2 - bool 3 - 4 1 config SA1111 5 2 bool 6 3 select DMABOUNCE if !ARCH_PXA
-1
arch/arm/common/Makefile
··· 4 4 5 5 obj-y += firmware.o 6 6 7 - obj-$(CONFIG_ICST) += icst.o 8 7 obj-$(CONFIG_SA1111) += sa1111.o 9 8 obj-$(CONFIG_DMABOUNCE) += dmabounce.o 10 9 obj-$(CONFIG_SHARP_LOCOMO) += locomo.o
+1 -1
arch/arm/common/icst.c drivers/clk/versatile/icst.c
··· 17 17 #include <linux/module.h> 18 18 #include <linux/kernel.h> 19 19 #include <asm/div64.h> 20 - #include <asm/hardware/icst.h> 20 + #include "icst.h" 21 21 22 22 /* 23 23 * Divisors for each OD setting.
+2 -4
arch/arm/include/asm/hardware/icst.h drivers/clk/versatile/icst.h
··· 1 1 /* 2 - * arch/arm/include/asm/hardware/icst.h 3 - * 4 2 * Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved. 5 3 * 6 4 * This program is free software; you can redistribute it and/or modify ··· 9 11 * clock generators. See http://www.idt.com/ for more information 10 12 * on these devices. 11 13 */ 12 - #ifndef ASMARM_HARDWARE_ICST_H 13 - #define ASMARM_HARDWARE_ICST_H 14 + #ifndef ICST_H 15 + #define ICST_H 14 16 15 17 struct icst_params { 16 18 unsigned long ref;
+3
drivers/clk/versatile/Kconfig
··· 1 + config ICST 2 + bool 3 + 1 4 config COMMON_CLK_VERSATILE 2 5 bool "Clock driver for ARM Reference designs" 3 6 depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
+1 -1
drivers/clk/versatile/Makefile
··· 1 1 # Makefile for Versatile-specific clocks 2 - obj-$(CONFIG_ICST) += clk-icst.o clk-versatile.o 2 + obj-$(CONFIG_ICST) += icst.o clk-icst.o clk-versatile.o 3 3 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o 4 4 obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o 5 5 obj-$(CONFIG_CLK_SP810) += clk-sp810.o
+1
drivers/clk/versatile/clk-icst.c
··· 22 22 #include <linux/regmap.h> 23 23 #include <linux/mfd/syscon.h> 24 24 25 + #include "icst.h" 25 26 #include "clk-icst.h" 26 27 27 28 /* Magic unlocking token used on all Versatile boards */
-2
drivers/clk/versatile/clk-icst.h
··· 1 - #include <asm/hardware/icst.h> 2 - 3 1 /** 4 2 * struct clk_icst_desc - descriptor for the ICST VCO 5 3 * @params: ICST parameters
+1
drivers/clk/versatile/clk-impd1.c
··· 12 12 #include <linux/io.h> 13 13 #include <linux/platform_data/clk-integrator.h> 14 14 15 + #include "icst.h" 15 16 #include "clk-icst.h" 16 17 17 18 #define IMPD1_OSC1 0x00
+1
drivers/clk/versatile/clk-realview.c
··· 11 11 #include <linux/io.h> 12 12 #include <linux/clk-provider.h> 13 13 14 + #include "icst.h" 14 15 #include "clk-icst.h" 15 16 16 17 #define REALVIEW_SYS_OSC0_OFFSET 0x0C
+1
drivers/clk/versatile/clk-versatile.c
··· 12 12 #include <linux/of.h> 13 13 #include <linux/of_address.h> 14 14 15 + #include "icst.h" 15 16 #include "clk-icst.h" 16 17 17 18 #define INTEGRATOR_HDR_LOCK_OFFSET 0x14