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

Commit 50667d63 authored by Linus Walleij's avatar Linus Walleij Committed by Mike Turquette
Browse files

ARM: u300: convert to common clock 



This converts the U300 clock implementation over to use the common
struct clk and moves the implementation down into drivers/clk.
Since VCO isn't used in tree it was removed, it's not hard to
put it back in if need be.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: trivial Makefile conflict]
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 9ca1c5a4

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ config ARCH_U300 
	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select COMMON_CLK

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

arch/arm/mach-u300/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel, U300 machine.

#



obj-y		:= core.o clock.o timer.o

obj-y		:= core.o timer.o

obj-m		:=

obj-n		:=

obj-		:=