Commit f4b8b319 authored by Russell King's avatar Russell King
Browse files

ARM: Realview/Versatile/Integrator: separate out common clock code 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c5a0adb5

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ config ARCH_INTEGRATOR 
	select ICST

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	help

	  Support for ARM's Integrator platform.
@@ -255,6 +256,7 @@ config ARCH_REALVIEW 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	help

	  This enables support for ARM Ltd RealView boards.
@@ -268,6 +270,7 @@ config ARCH_VERSATILE 
	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select PLAT_VERSATILE

	help

	  This enables support for ARM Ltd Versatile board.
@@ -938,6 +941,9 @@ config PLAT_ORION 
config PLAT_PXA

	bool



config PLAT_VERSATILE

	bool



source arch/arm/mm/Kconfig



config IWMMXT

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ plat-$(CONFIG_PLAT_PXA) := pxa 
plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/mach-integrator/Makefile

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


# Object file lists.



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

obj-y					:= core.o lm.o

obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o

obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o

arch/arm/mach-realview/Makefile

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

#



obj-y					:= core.o clock.o

obj-y					:= core.o

obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o

obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o

obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o

arch/arm/mach-realview/clock.c

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/mach-realview/clock.c

 *

 *  Copyright (C) 2004 ARM Limited.

 *  Written by Deep Blue Solutions Limited.

 *

 * 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.

 */

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/device.h>

#include <linux/list.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/string.h>

#include <linux/clk.h>

#include <linux/mutex.h>



#include <asm/hardware/icst.h>



#include "clock.h"



int clk_enable(struct clk *clk)

{

	return 0;

}

EXPORT_SYMBOL(clk_enable);



void clk_disable(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_disable);



unsigned long clk_get_rate(struct clk *clk)

{

	return clk->rate;

}

EXPORT_SYMBOL(clk_get_rate);



long clk_round_rate(struct clk *clk, unsigned long rate)

{

	struct icst_vco vco;

	vco = icst_hz_to_vco(clk->params, rate);

	return icst_hz(clk->params, vco);

}

EXPORT_SYMBOL(clk_round_rate);



int clk_set_rate(struct clk *clk, unsigned long rate)

{

	int ret = -EIO;



	if (clk->setvco) {

		struct icst_vco vco;



		vco = icst_hz_to_vco(clk->params, rate);

		clk->rate = icst_hz(clk->params, vco);

		clk->setvco(clk, vco);

		ret = 0;

	}

	return ret;

}

EXPORT_SYMBOL(clk_set_rate);