Commit 7b020654 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-to-clk-icst' of... 

Merge tag 'arm-to-clk-icst' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/drivers

This moves the ICST helper library from arch/arm to drivers/clk

* tag 'arm-to-clk-icst' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM/clk: move the ICST library to drivers/clk
  ARM: plat-versatile: remove stale clock header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5397b5c4 ba3fae06

arch/arm/common/Kconfig

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

	bool



config SA1111

	bool

	select DMABOUNCE if !ARCH_PXA

arch/arm/common/Makefile

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


obj-y				+= firmware.o



obj-$(CONFIG_ICST)		+= icst.o

obj-$(CONFIG_SA1111)		+= sa1111.o

obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o

obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o

arch/arm/plat-versatile/include/plat/clock.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#ifndef PLAT_CLOCK_H

#define PLAT_CLOCK_H



#include <asm/hardware/icst.h>



struct clk_ops {

	long	(*round)(struct clk *, unsigned long);

	int	(*set)(struct clk *, unsigned long);

	void	(*setvco)(struct clk *, struct icst_vco);

};



int icst_clk_set(struct clk *, unsigned long);

long icst_clk_round(struct clk *, unsigned long);



#endif

drivers/clk/versatile/Kconfig

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

	bool



config COMMON_CLK_VERSATILE

	bool "Clock driver for ARM Reference designs"

	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \

drivers/clk/versatile/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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_ARCH_REALVIEW)	+= clk-realview.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE