Merge tag 'plat-versatile-cleanup' of...

generic-y += bitsperlong.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += current.h

generic-y += early_ioremap.h

/*

 *  arch/arm/include/asm/clkdev.h

 *

 *  Copyright (C) 2008 Russell King.

 *

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

 *

 * Helper for the clk API to assist looking up a struct clk.

 */

#ifndef __ASM_CLKDEV_H

#define __ASM_CLKDEV_H

#include <linux/slab.h>

#ifndef CONFIG_COMMON_CLK

#ifdef CONFIG_HAVE_MACH_CLKDEV

#include <mach/clkdev.h>

#else

#define __clk_get(clk)	({ 1; })

#define __clk_put(clk)	do { } while (0)

#endif

#endif

static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)

{

	return kzalloc(size, GFP_KERNEL);

}

#endif

if PLAT_VERSATILE

config PLAT_VERSATILE_CLOCK

	bool

config PLAT_VERSATILE_SCHED_CLOCK

	bool

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include

obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o

obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o

obj-$(CONFIG_SMP) += headsmp.o platsmp.o

/*

 *  linux/arch/arm/plat-versatile/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/errno.h>

#include <linux/clk.h>

#include <linux/mutex.h>

#include <asm/hardware/icst.h>

#include <mach/clkdev.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)

{

	long ret = -EIO;

	if (clk->ops && clk->ops->round)

		ret = clk->ops->round(clk, rate);

	return ret;

}

EXPORT_SYMBOL(clk_round_rate);

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

{

	int ret = -EIO;

	if (clk->ops && clk->ops->set)

		ret = clk->ops->set(clk, rate);

	return ret;

}

EXPORT_SYMBOL(clk_set_rate);

long icst_clk_round(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(icst_clk_round);

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

{

	struct icst_vco vco;

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

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

	clk->ops->setvco(clk, vco);

	return 0;

}

EXPORT_SYMBOL(icst_clk_set);