Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba3fae06 authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b6acb2e4

arch/arm/common/Kconfig

+0 −3
Original line number Original line Diff line number Diff line 
config ICST

	bool



config SA1111

config SA1111

	bool

	bool

	select DMABOUNCE if !ARCH_PXA

	select DMABOUNCE if !ARCH_PXA

arch/arm/common/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 




obj-y				+= firmware.o

obj-y				+= firmware.o





obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o

obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o

obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o

obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o

drivers/clk/versatile/Kconfig

+3 −0
Original line number Original line Diff line number Diff line 
config ICST

	bool



config COMMON_CLK_VERSATILE

config COMMON_CLK_VERSATILE

	bool "Clock driver for ARM Reference designs"

	bool "Clock driver for ARM Reference designs"

	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \

	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \

drivers/clk/versatile/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
# Makefile for Versatile-specific clocks

# Makefile for Versatile-specific clocks

obj-$(CONFIG_ICST)		+= clk-icst.o clk-versatile.o

obj-$(CONFIG_ICST)		+= icst.o clk-icst.o clk-versatile.o

obj-$(CONFIG_INTEGRATOR_IMPD1)	+= clk-impd1.o

obj-$(CONFIG_INTEGRATOR_IMPD1)	+= clk-impd1.o

obj-$(CONFIG_ARCH_REALVIEW)	+= clk-realview.o

obj-$(CONFIG_ARCH_REALVIEW)	+= clk-realview.o

obj-$(CONFIG_CLK_SP810)		+= clk-sp810.o

obj-$(CONFIG_CLK_SP810)		+= clk-sp810.o

drivers/clk/versatile/clk-icst.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon.h>





#include "icst.h"

#include "clk-icst.h"

#include "clk-icst.h"





/* Magic unlocking token used on all Versatile boards */

/* Magic unlocking token used on all Versatile boards */